From 5ad3ab8a1639eb7feebca9cba2be634bde9dd362 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Wed, 11 Jun 2014 15:22:32 -0700 Subject: [PATCH] Delete a local ref in getSurface ANativeWindow_fromSurface() provides a native-only call path to android_view_Surface_getSurface(), so we need to clean up the local reference. Bug 14087233 Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9 --- core/jni/android_view_Surface.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 11f87cc227ec1..3d14aaf5d88f0 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -95,6 +95,7 @@ sp android_view_Surface_getSurface(JNIEnv* env, jobject surfaceObj) { env->GetLongField(surfaceObj, gSurfaceClassInfo.mNativeObject)); env->MonitorExit(lock); } + env->DeleteLocalRef(lock); return sur; }