summaryrefslogtreecommitdiffstats
path: root/ndk
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-02 00:54:02 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-02-02 00:54:02 +0100
commit95ae335fd53daf85b206215423ddf7881b9cb4fd (patch)
tree6eb05cb62366b2d4638f0701419cda6f8c547497 /ndk
parentd9af3ac3e2f9f61d541e5c15c3d47bd8e0e6def5 (diff)
downloadandroid_development-95ae335fd53daf85b206215423ddf7881b9cb4fd.tar.gz
android_development-95ae335fd53daf85b206215423ddf7881b9cb4fd.tar.bz2
android_development-95ae335fd53daf85b206215423ddf7881b9cb4fd.zip
native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
The window field must not be set to NULL in the pre-hook, only the post-one. See http://code.google.com/p/android/issues/detail?id=14352 Change-Id: Ib6214d47c97766bf4a5e148b6b6707e08366fe36
Diffstat (limited to 'ndk')
-rw-r--r--ndk/sources/android/native_app_glue/android_native_app_glue.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ndk/sources/android/native_app_glue/android_native_app_glue.c b/ndk/sources/android/native_app_glue/android_native_app_glue.c
index fbd42b431..3069f1751 100644
--- a/ndk/sources/android/native_app_glue/android_native_app_glue.c
+++ b/ndk/sources/android/native_app_glue/android_native_app_glue.c
@@ -106,10 +106,7 @@ void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd) {
case APP_CMD_TERM_WINDOW:
LOGI("APP_CMD_TERM_WINDOW\n");
- pthread_mutex_lock(&android_app->mutex);
- android_app->window = NULL;
pthread_cond_broadcast(&android_app->cond);
- pthread_mutex_unlock(&android_app->mutex);
break;
case APP_CMD_RESUME: