Merge "Safely dispose of the resize buffer" (4a7052a7) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -923,10 +923,15 @@ public final class ViewRootImpl implements ViewParent,
		}

		void disposeResizeBuffer() {
		if (mResizeBuffer != null) {
		if (mResizeBuffer != null && mAttachInfo.mHardwareRenderer != null) {
		mAttachInfo.mHardwareRenderer.safelyRun(new Runnable() {
		@Override
		public void run() {
		mResizeBuffer.destroy();
		mResizeBuffer = null;
		}
		});
		}
		}

		/**
		@@ -1466,8 +1471,7 @@ public final class ViewRootImpl implements ViewParent,
		if (mResizeBuffer != null) {
		mResizeBuffer.end(hwRendererCanvas);
		if (!completed) {
		mResizeBuffer.destroy();
		mResizeBuffer = null;
		disposeResizeBuffer();
		}
		}
		}