Merge "Plug some potential memory leaks in DreamOverlayContainerViewController" into main (d05be354) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase {
		@Test
		public void testBurnInProtectionStopsWhenContentViewDetached() {
		mController.onViewDetached();
		verify(mHandler).removeCallbacks(any(Runnable.class));
		verify(mHandler).removeCallbacksAndMessages(null);
		}

		@Test
		@@ -281,4 +281,16 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase {

		verify(mAnimationsController).cancelAnimations();
		}

		@Test
		public void onViewAttached_addsScrimExpansionCallback() {
		mController.onViewAttached();
		verify(mBouncerlessScrimController).addCallback(any());
		}

		@Test
		public void onViewDetached_removesScrimExpansionCallback() {
		mController.onViewDetached();
		verify(mBouncerlessScrimController).removeCallback(any());
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -198,7 +198,6 @@ public class DreamOverlayContainerViewController extends
		mLowLightTransitionCoordinator = lowLightTransitionCoordinator;

		mBouncerlessScrimController = bouncerlessScrimController;
		mBouncerlessScrimController.addCallback(mBouncerlessExpansionCallback);

		mKeyguardTransitionInteractor = keyguardTransitionInteractor;

		@@ -234,6 +233,7 @@ public class DreamOverlayContainerViewController extends
		mJitterStartTimeMillis = System.currentTimeMillis();
		mHandler.postDelayed(this::updateBurnInOffsets, mBurnInProtectionUpdateInterval);
		mPrimaryBouncerCallbackInteractor.addBouncerExpansionCallback(mBouncerExpansionCallback);
		mBouncerlessScrimController.addCallback(mBouncerlessExpansionCallback);
		final Region emptyRegion = Region.obtain();
		mView.getRootSurfaceControl().setTouchableRegion(emptyRegion);
		emptyRegion.recycle();
		@@ -255,8 +255,9 @@ public class DreamOverlayContainerViewController extends

		@Override
		protected void onViewDetached() {
		mHandler.removeCallbacks(this::updateBurnInOffsets);
		mHandler.removeCallbacksAndMessages(null);
		mPrimaryBouncerCallbackInteractor.removeBouncerExpansionCallback(mBouncerExpansionCallback);
		mBouncerlessScrimController.removeCallback(mBouncerlessExpansionCallback);

		mDreamOverlayAnimationsController.cancelAnimations();
		}