From 0cfbfd08f76de65503e44fc896c6e382f8a215a0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 12 Dec 2017 11:10:51 +0800 Subject: [PATCH] Kill process if Cocos2dxActivity.onDestroy is invoked to resolve crash if app goes to background for a long time and Activity is recycled by system. (#1027) --- .../android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java index 175bae89f0..0ffefe1555 100644 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -260,6 +260,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe @Override protected void onCreate(final Bundle savedInstanceState) { + Log.d(TAG, "Cocos2dxActivity onCreate: " + this + ", savedInstanceState: " + savedInstanceState); super.onCreate(savedInstanceState); // Workaround in https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508 @@ -354,6 +355,11 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this); CAAgent.onDestroy(); super.onDestroy(); + + Log.d(TAG, "Cocos2dxActivity onDestroy: " + this + ", mGLSurfaceView" + mGLSurfaceView); + if (mGLSurfaceView != null) { + Cocos2dxHelper.terminateProcess(); + } } @Override