The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-23 07:28:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed setting of screen saver state crashing on some version of Android.

Browse Source 
Setting Window flags seems to affect Views and must be handled on UI thread.
This commit is contained in:
Philipp Wiesemann 2014-10-20 22:19:09 +02:00
parent 79035b393a
commit 5f193f0c60
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,13 +187,6 @@ public class SDLActivity extends Activity {
return super.dispatchKeyEvent(event); return super.dispatchKeyEvent(event);
} }
public static void suspendScreenSaver(boolean suspend) {
if (suspend)
mSingleton.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
else
mSingleton.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
/** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
* is the first to be called, mIsSurfaceReady should still be set * is the first to be called, mIsSurfaceReady should still be set
* to 'true' during the call to onPause (in a usual scenario). * to 'true' during the call to onPause (in a usual scenario).
@ -229,6 +222,7 @@ public class SDLActivity extends Activity {
static final int COMMAND_CHANGE_TITLE = 1; static final int COMMAND_CHANGE_TITLE = 1;
static final int COMMAND_UNUSED = 2; static final int COMMAND_UNUSED = 2;
static final int COMMAND_TEXTEDIT_HIDE = 3; static final int COMMAND_TEXTEDIT_HIDE = 3;
static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
protected static final int COMMAND_USER = 0x8000; protected static final int COMMAND_USER = 0x8000;
@ -273,7 +267,18 @@ public class SDLActivity extends Activity {
imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0); imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
} }
break; break;
case COMMAND_SET_KEEP_SCREEN_ON:
{
Window window = ((Activity) context).getWindow();
if (window != null) {
if ((msg.obj instanceof Integer) && (((Integer) msg.obj).intValue() != 0)) {
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
} else {
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
}
break;
}
default: default:
if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) { if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
Log.e(TAG, "error handling message, command is " + msg.arg1); Log.e(TAG, "error handling message, command is " + msg.arg1);

17
src/core/android/SDL_android.c
View File

@ -77,7 +77,6 @@ static jmethodID midAudioWriteShortBuffer;
static jmethodID midAudioWriteByteBuffer; static jmethodID midAudioWriteByteBuffer;
static jmethodID midAudioQuit; static jmethodID midAudioQuit;
static jmethodID midPollInputDevices; static jmethodID midPollInputDevices;
static jmethodID midSuspendScreenSaver;
/* Accelerometer data storage */ /* Accelerometer data storage */
static float fLastAccelerometer[3]; static float fLastAccelerometer[3];
@ -132,8 +131,6 @@ JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv* mEnv, jclass cls)
"audioQuit", "()V"); "audioQuit", "()V");
midPollInputDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, midPollInputDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
"pollInputDevices", "()V"); "pollInputDevices", "()V");
midSuspendScreenSaver = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
"suspendScreenSaver", "(Z)V");
bHasNewData = false; bHasNewData = false;
@ -450,12 +447,6 @@ static SDL_bool LocalReferenceHolder_IsActive()
return s_active > 0; return s_active > 0;
} }
void Android_JNI_SuspendScreenSaver(SDL_bool suspend)
{
JNIEnv *env = Android_JNI_GetEnv();
(*env)->CallStaticObjectMethod(env, mActivityClass, midSuspendScreenSaver, suspend);
}
ANativeWindow* Android_JNI_GetNativeWindow(void) ANativeWindow* Android_JNI_GetNativeWindow(void)
{ {
ANativeWindow* anw; ANativeWindow* anw;
@ -1311,6 +1302,9 @@ void Android_JNI_PollInputDevices()
(*env)->CallStaticVoidMethod(env, mActivityClass, midPollInputDevices); (*env)->CallStaticVoidMethod(env, mActivityClass, midPollInputDevices);
} }
/* See SDLActivity.java for constants. */
#define COMMAND_SET_KEEP_SCREEN_ON 5
/* sends message to be handled on the UI event dispatch thread */ /* sends message to be handled on the UI event dispatch thread */
int Android_JNI_SendMessage(int command, int param) int Android_JNI_SendMessage(int command, int param)
{ {
@ -1326,6 +1320,11 @@ int Android_JNI_SendMessage(int command, int param)
return success ? 0 : -1; return success ? 0 : -1;
} }
void Android_JNI_SuspendScreenSaver(SDL_bool suspend)
{
Android_JNI_SendMessage(COMMAND_SET_KEEP_SCREEN_ON, (suspend == SDL_FALSE) ? 0 : 1);
}
void Android_JNI_ShowTextInput(SDL_Rect *inputRect) void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
{ {
JNIEnv *env = Android_JNI_GetEnv(); JNIEnv *env = Android_JNI_GetEnv();