Commit 6a84f3d8 authored Feb 05, 2015 by Miao Wang Committed by Android Git Automerger Feb 05, 2015

am 4bd2c00d: Merge "make Allocation.destroy() include setSurface(null) for...

am 4bd2c00d: Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc0 automerge: 58fd96c6

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

parents ecad24b4 4bd2c00d

rs/java/android/renderscript/Allocation.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -1882,4 +1882,15 @@ public class Allocation extends BaseObj {
		}
		}

		/**
		* For USAGE_IO_OUTPUT, destroy() implies setSurface(null).
		*
		*/
		@Override
		public void destroy() {
		if((mUsage & USAGE_IO_OUTPUT) != 0) {
		setSurface(null);
		}
		super.destroy();
		}
		}