zinface
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: fix wrong state after immediate sequence pause() / resume() / pause() 

It may happen to have the sequence pause()/resume()/pause(), before polling
any events.

Before, it ends in 'resumed' state because as the check is greedy.
Now, always increase the Pause semaphore, and stop at each pause.
It ends in 'paused' state.

Related to bug 3250: set up a reconfiguration of SurfaceView holder.
Turn the screen off manually before the app starts
(repro rate is not 100%..)
This commit is contained in:
Sylvain Becker 2019-01-05 22:27:25 +01:00
parent d4c0f498db
commit 35722b6423
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,8 +820,10 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePause)(
SDL_SendAppEvent(SDL_APP_DIDENTERBACKGROUND); SDL_SendAppEvent(SDL_APP_DIDENTERBACKGROUND);
/* *After* sending the relevant events, signal the pause semaphore /* *After* sending the relevant events, signal the pause semaphore
* so the event loop knows to pause and (optionally) block itself */ * so the event loop knows to pause and (optionally) block itself.
if (!SDL_SemValue(Android_PauseSem)) SDL_SemPost(Android_PauseSem); * Sometimes 2 pauses can be queued (eg pause/resume/pause), so it's
* always increased. */
SDL_SemPost(Android_PauseSem);
} }
SDL_UnlockMutex(Android_ActivityMutex); SDL_UnlockMutex(Android_ActivityMutex);

14
src/video/android/SDL_androidevents.c
View File

@ -39,6 +39,13 @@ static void ANDROIDAUDIO_ResumeDevices(void) {}
static void ANDROIDAUDIO_PauseDevices(void) {} static void ANDROIDAUDIO_PauseDevices(void) {}
#endif #endif
/* Number of event types in the event queue */
static int
SDL_NumberOfEvent(Uint32 type)
{
return SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, type, type);
}
static void static void
android_egl_context_restore(SDL_Window *window) android_egl_context_restore(SDL_Window *window)
{ {
@ -103,9 +110,10 @@ Android_PumpEvents(_THIS)
} }
} else { } else {
if (isPausing || SDL_SemTryWait(Android_PauseSem) == 0) { if (isPausing || SDL_SemTryWait(Android_PauseSem) == 0) {
/* We've been signaled to pause, but before we block ourselves, /* We've been signaled to pause (potentially several times), but before we block ourselves,
we need to make sure that the very last event have reached the app */ * we need to make sure that the very last event (of the first pause sequence, if several)
if (SDL_HasEvent(SDL_APP_DIDENTERBACKGROUND)) { * has reached the app */
if (SDL_NumberOfEvent(SDL_APP_DIDENTERBACKGROUND) > SDL_SemValue(Android_PauseSem)) {
isPausing = 1; isPausing = 1;
} }
else { else {