Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860c2e17 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "ANativeWindow_fromSurface: Use acquire not incStrong" into sc-dev am: b71cd0f5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443411

Change-Id: Ia12a729c6a469428a7f4beb745c2d15d150e9afc
parents b74ceb5c b71cd0f5

native/android/native_window_jni.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ using namespace android; 
ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface) {

    sp<ANativeWindow> win = android_view_Surface_getNativeWindow(env, surface);

    if (win != NULL) {

        win->incStrong((void*)ANativeWindow_fromSurface);

        ANativeWindow_acquire(win.get());

    }

    return win.get();

}