commit 4bd2c00d8d27d37c5e90a42ec2e39dd9fdd149eb
author Miao Wang <miaowang@google.com> Thu Feb 05 00:27:49 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 05 00:27:49 2015 +0000
tree 179f7bbca4d4e9adbd0be353e3fd164a33b7dcbc
parent c7e6b93aba9dce93aacb05b5d9f59d09eddb0329
parent 58fd96c607de7f7f821a0b15fd37bc28323fcfde

Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc
automerge: 58fd96c

* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)

rs/java/android/renderscript/Allocation.java

diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 4e89566..e979a1be 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -1882,4 +1882,15 @@
         }
     }
 
+    /**
+     * For USAGE_IO_OUTPUT, destroy() implies setSurface(null).
+     *
+     */
+    @Override
+    public void destroy() {
+        if((mUsage & USAGE_IO_OUTPUT) != 0) {
+            setSurface(null);
+        }
+        super.destroy();
+    }
 }