summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rob Carr <racarr@google.com> 2021-05-06 18:44:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-06 18:44:36 +0000
commitb71cd0f51ed7e324c8f8a1b4cb6d71b003797964 (patch)
tree30f5aa95263f377335357a87b0c96394befa5b1a
parentf3dc01bf8c7daa91b66bf5ee384f316660dcc892 (diff)
parent86b378b810ab3bbcdb1427bdd86a7a4a4065fccd (diff)
Merge "ANativeWindow_fromSurface: Use acquire not incStrong" into sc-dev
-rw-r--r--native/android/native_window_jni.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/native_window_jni.cpp b/native/android/native_window_jni.cpp
index 859c550db94d..901b4de4f13b 100644
--- a/native/android/native_window_jni.cpp
+++ b/native/android/native_window_jni.cpp
@@ -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();
}