Merge pull request #71 from c4games/sync-v3-pull-19256

halx99 · web-flow · commit b350a7abf8c1 · 2020-02-24T19:52:22.000+08:00
Sync v3 pr-19256
diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java
@@ -280,6 +280,7 @@ public void init() {
 
         // Cocos2dxGLSurfaceView
         this.mGLSurfaceView = this.onCreateView();
+        this.mGLSurfaceView.setPreserveEGLContextOnPause(true);
 
         // ...add to FrameLayout
         mFrameLayout.addView(this.mGLSurfaceView);
diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
@@ -199,7 +199,7 @@ public void run() {
             }
         });
         this.setRenderMode(RENDERMODE_WHEN_DIRTY);
-        //super.onPause();
+        super.onPause();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public void run() {`
`199`	`199`	`}`
`200`	`200`	`});`
`201`	`201`	`this.setRenderMode(RENDERMODE_WHEN_DIRTY);`
`202`		`- //super.onPause();`
	`202`	`+ super.onPause();`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`@Override`