encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always release devices in onPause in case we're going to be force stopped, and for consistency with interacting with other activities that might use the controller

This commit is contained in:
Sam Lantinga 2020-01-26 00:37:48 -08:00
parent c9f672fde4
commit ce7c51a9cc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -283,10 +283,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
return; return;
} }
if (mHIDDeviceManager != null) {
mHIDDeviceManager.setFrozen(true);
}
SDLActivity.handleNativeState(); SDLActivity.handleNativeState();
} }
@ -298,10 +294,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
return; return;
} }
if (mHIDDeviceManager != null) {
mHIDDeviceManager.setFrozen(false);
}
SDLActivity.handleNativeState(); SDLActivity.handleNativeState();
} }
@ -310,6 +302,10 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
protected void onPause() { protected void onPause() {
Log.v(TAG, "onPause()"); Log.v(TAG, "onPause()");
super.onPause(); super.onPause();
if (mHIDDeviceManager != null) {
mHIDDeviceManager.setFrozen(true);
}
if (!mHasMultiWindow) { if (!mHasMultiWindow) {
pauseNativeThread(); pauseNativeThread();
} }
@ -319,6 +315,10 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
protected void onResume() { protected void onResume() {
Log.v(TAG, "onResume()"); Log.v(TAG, "onResume()");
super.onResume(); super.onResume();
if (mHIDDeviceManager != null) {
mHIDDeviceManager.setFrozen(false);
}
if (!mHasMultiWindow) { if (!mHasMultiWindow) {
resumeNativeThread(); resumeNativeThread();
} }