Commit 59df6d6b13a095cd8bb0bcc48531b1f3e85a820a
2019-01-07T17:06:50
Android: don't allow multiple instance of SDLActivity Default launch mode (standard) allows multiple instances of the SDLActivity. ( https://developer.android.com/guide/topics/manifest/activity-element#lmode ) Not sure this is intended in SDL as this doesn't work. There are static variables in Java, in C code which make this impossible (allow one android_window) and also Audio print errors. There is also some code added in onDestroy as if it would be able to re-initialize: https://hg.libsdl.org/SDL/rev/27686adb08c3 Bug Android activity life-cycle seems to show there is not transition to get out of onDestroy() https://developer.android.com/reference/android/app/Activity#ActivityLifecycle ( can be tested with "adb shell am start my.package.org/.MainActivity" and "adb shell am start -n my.package.org/.MainActivity" ) Send me a message if there are real use-case for this !
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 25730cf..e994e46 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -54,6 +54,8 @@
<activity android:name="SDLActivity"
android:label="@string/app_name"
+ android:alwaysRetainTaskState="true"
+ android:launchMode="singleInstance"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
>
<intent-filter>
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index 71db555..ac8515d 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -386,8 +386,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
if (SDLActivity.mBrokenLibraries) {
super.onDestroy();
- // Reset everything in case the user re opens the app
- SDLActivity.initialize();
return;
}
@@ -405,15 +403,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
} catch(Exception e) {
Log.v(TAG, "Problem stopping thread: " + e);
}
- SDLActivity.mSDLThread = null;
-
- //Log.v(TAG, "Finished waiting for SDL thread");
}
super.onDestroy();
-
- // Reset everything in case the user re opens the app
- SDLActivity.initialize();
}
@Override
@@ -1711,12 +1703,12 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
return;
}
- /* Surface is ready */
- SDLActivity.mIsSurfaceReady = true;
-
/* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
SDLActivity.onNativeSurfaceChanged();
+ /* Surface is ready */
+ SDLActivity.mIsSurfaceReady = true;
+
SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
SDLActivity.handleNativeState();
}