summaryrefslogtreecommitdiffstats
path: root/ndk
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-02 09:53:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-02 09:53:15 -0800
commit442064f4a910bc5c9997e81d451e5721f6e96696 (patch)
tree8b4c55c48d7722b9ba18ee36b8fcfed9ac538be7 /ndk
parent33d8964ce12e438e70456be368bbbf2702efb05b (diff)
parentfd2d786dd10efc9bf3ce0f5f21fbf80f617286a1 (diff)
downloadandroid_development-442064f4a910bc5c9997e81d451e5721f6e96696.tar.gz
android_development-442064f4a910bc5c9997e81d451e5721f6e96696.tar.bz2
android_development-442064f4a910bc5c9997e81d451e5721f6e96696.zip
am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook"
* commit 'fd2d786dd10efc9bf3ce0f5f21fbf80f617286a1': native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
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: