Merge "More SurfaceAnimator lifetime fixes." into qt-dev (ed5d40cf) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ class Dimmer {
		private static final int DEFAULT_DIM_ANIM_DURATION = 200;

		private class DimAnimatable implements SurfaceAnimator.Animatable {
		private final SurfaceControl mDimLayer;
		private SurfaceControl mDimLayer;

		private DimAnimatable(SurfaceControl dimLayer) {
		mDimLayer = dimLayer;
		@@ -100,6 +100,11 @@ class Dimmer {
		// See getSurfaceWidth() above for explanation.
		return mHost.getSurfaceHeight();
		}

		void removeSurface() {
		getPendingTransaction().remove(mDimLayer);
		mDimLayer = null;
		}
		}

		@VisibleForTesting
		@@ -129,8 +134,7 @@ class Dimmer {
		final DimAnimatable dimAnimatable = new DimAnimatable(dimLayer);
		mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> {
		if (!mDimming) {
		dimAnimatable.getPendingTransaction().remove(mDimLayer);
		mDimLayer = null;
		dimAnimatable.removeSurface();
		}
		}, mHost.mWmService);
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -286,9 +286,13 @@ class SurfaceAnimator {
		final boolean destroy = mLeash != null && surface != null && parent != null;
		if (destroy) {
		if (DEBUG_ANIM) Slog.i(TAG, "Reparenting to original parent");
		// We shouldn't really need these isValid checks but we do
		// b/130364451
		if (surface.isValid() && parent.isValid()) {
		t.reparent(surface, parent);
		scheduleAnim = true;
		}
		}
		mService.mAnimationTransferMap.remove(mAnimation);
		if (mLeash != null && destroyLeash) {
		t.remove(mLeash);