Android: Add some missing codepaths when using Vulkan, might fix audi…

…o/controller issues on task switching
hrydgard · Aug 8, 2017 · e268da8 · e268da8
1 parent 5e4e23f
commit e268da8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -549,14 +549,17 @@ protected void onDestroy() {
 		if (javaGL) {
 			Log.i(TAG, "onDestroy");
 			mGLSurfaceView.onDestroy();
-			NativeApp.audioShutdown();
 			// Probably vain attempt to help the garbage collector...
 			mGLSurfaceView = null;
 			audioFocusChangeListener = null;
 			audioManager = null;
-			unregisterCallbacks();
+		} else {
+			mSurfaceView.onDestroy();
+			mSurfaceView = null;
 		}
 		if (shuttingDown || isFinishing()) {
+			unregisterCallbacks();
+			NativeApp.audioShutdown();
 			NativeApp.shutdown();
 			initialized = false;
 		}
@@ -595,7 +598,6 @@ private boolean detectOpenGLES30() {
         return info.reqGlEsVersion >= 0x30000;
     }
 
-
 	@Override
 	protected void onResume() {
 		super.onResume();
@@ -614,6 +616,10 @@ protected void onResume() {
 			} else {
 				Log.e(TAG, "mGLSurfaceView really shouldn't be null in onResume");
 			}
+		} else {
+			if (mSurfaceView != null) {
+				mSurfaceView.onResume();
+			}
 		}
 
 		gainAudioFocus(this.audioManager, this.audioFocusChangeListener);

diff --git a/android/src/org/ppsspp/ppsspp/NativeSurfaceView.java b/android/src/org/ppsspp/ppsspp/NativeSurfaceView.java
@@ -133,6 +133,7 @@ public void onResume() {
 	}
 
 	public void onDestroy() {
+		Log.i(TAG, "onDestroy");
 		if (mController != null) {
 			mController.exit();
 		}