Merge "DimLayer: More release fixes." into qt-dev am: 0d168340d1 (65448b33) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,9 @@ class Dimmer {
		}

		void removeSurface() {
		if (mDimLayer != null && mDimLayer.isValid()) {
		getPendingTransaction().remove(mDimLayer);
		}
		mDimLayer = null;
		}
		}
		@@ -305,7 +307,9 @@ class Dimmer {

		if (!mDimState.mDimming) {
		if (!mDimState.mAnimateExit) {
		if (mDimState.mDimLayer.isValid()) {
		t.remove(mDimState.mDimLayer);
		}
		} else {
		startDimExit(mLastRequestedDimContainer, mDimState.mSurfaceAnimator, t);
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertNotNull;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.Mockito.when;

		import android.graphics.Rect;
		import android.platform.test.annotations.Presubmit;
		@@ -78,7 +79,9 @@ public class DimmerTests extends WindowTestsBase {

		@Override
		public SurfaceControl build() {
		return mock(SurfaceControl.class);
		SurfaceControl mSc = mock(SurfaceControl.class);
		when(mSc.isValid()).thenReturn(true);
		return mSc;
		}
		}