commit dbe0a73edbfe1429c006998809c90a0bae2f56d0
author Miao Wang <miaowang@google.com> Thu Mar 09 20:57:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 09 20:57:29 2017 +0000
tree 7a67176729347912a36941fa2e36a59a55dbaa6e
parent d464402ab7976c34284e351c3dbc4ecd17db1a75
parent db889edb1ddc8d032dbbacdb69494eb8573e6ca5

Merge changes from topic 'USAGE_IO_INPUT' am: 70fac233fa
am: db889edb1d

Change-Id: If3762d0880be154865b46654cde08275d3dd66fa

rs/jni/android_renderscript_RenderScript.cpp

diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index c663255..b4630ef 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -1266,10 +1266,10 @@
         ALOGD("nAllocationGetSurface, con(%p), a(%p)", (RsContext)con, (RsAllocation)a);
     }
 
-    IGraphicBufferProducer *v = (IGraphicBufferProducer *)rsAllocationGetSurface((RsContext)con,
-                                                                                 (RsAllocation)a);
-    sp<IGraphicBufferProducer> bp = v;
-    v->decStrong(nullptr);
+    ANativeWindow *anw = (ANativeWindow *)rsAllocationGetSurface((RsContext)con, (RsAllocation)a);
+
+    sp<Surface> surface(static_cast<Surface*>(anw));
+    sp<IGraphicBufferProducer> bp = surface->getIGraphicBufferProducer();
 
     jobject o = android_view_Surface_createFromIGraphicBufferProducer(_env, bp);
     return o;