Merge "Add null check and call destroy from single point." (386b397b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/TaskStack.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -373,10 +373,8 @@ public class TaskStack {
		mService.requestTraversalLocked();
		}

		mAnimationBackgroundSurface.destroySurface();
		mAnimationBackgroundSurface = null;
		mDimLayer.destroySurface();
		mDimLayer = null;
		close();

		mDisplayContent = null;
		}

		@@ -501,8 +499,14 @@ public class TaskStack {
		}

		void close() {
		mDimLayer.mDimSurface.destroy();
		mAnimationBackgroundSurface.mDimSurface.destroy();
		if (mAnimationBackgroundSurface != null) {
		mAnimationBackgroundSurface.destroySurface();
		mAnimationBackgroundSurface = null;
		}
		if (mDimLayer != null) {
		mDimLayer.destroySurface();
		mDimLayer = null;
		}
		}

		public void dump(String prefix, PrintWriter pw) {