From 33287e8a893821be86b395ce9d5d639cc8a535f3 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Mon, 6 Mar 2017 09:31:32 -0800 Subject: [PATCH] [RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface. - ANativeWindow_fromSurface and ANativeWindow_release has to be used in pairs to avoid leaks. Bug: 34396220 Test: mm, CTS tests pass. Change-Id: Id67fd005a056df4d496a48f705d445a2d8c45232 --- rs/jni/Android.mk | 1 + rs/jni/android_renderscript_RenderScript.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 447a47d3c56e..4040db36c4fb 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -5,6 +5,7 @@ LOCAL_SRC_FILES:= \ android_renderscript_RenderScript.cpp LOCAL_SHARED_LIBRARIES := \ + libandroid \ libandroid_runtime \ libandroidfw \ libnativehelper \ diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 2300da32d355..c663255d3315 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -34,6 +34,8 @@ #include "android_runtime/android_view_Surface.h" #include "android_runtime/android_util_AssetManager.h" #include "android/graphics/GraphicsJNI.h" +#include "android/native_window.h" +#include "android/native_window_jni.h" #include #include @@ -1281,13 +1283,12 @@ nAllocationSetSurface(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobje (RsAllocation)alloc, (Surface *)sur); } - sp s; + ANativeWindow *anw = nullptr; if (sur != 0) { - s = android_view_Surface_getSurface(_env, sur); + anw = ANativeWindow_fromSurface(_env, sur); } - rsAllocationSetSurface((RsContext)con, (RsAllocation)alloc, - static_cast(s.get())); + rsAllocationSetSurface((RsContext)con, (RsAllocation)alloc, anw); } static void -- 2.11.0