Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DimLayer: More release fixes." into qt-dev

Browse Source
This commit is contained in:
Rob Carr
2019-04-23 01:15:20 +00:00
committed by Android (Google) Code Review
parent 79760f0745 024a349fe6
commit 0d168340d1
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/Dimmer.java
View File

@@ -102,7 +102,9 @@ class Dimmer {
} }
void removeSurface() { void removeSurface() {
getPendingTransaction().remove(mDimLayer); if (mDimLayer != null && mDimLayer.isValid()) {
getPendingTransaction().remove(mDimLayer);
}
mDimLayer = null; mDimLayer = null;
} }
} }
@@ -305,7 +307,9 @@ class Dimmer {
if (!mDimState.mDimming) { if (!mDimState.mDimming) {
if (!mDimState.mAnimateExit) { if (!mDimState.mAnimateExit) {
t.remove(mDimState.mDimLayer); if (mDimState.mDimLayer.isValid()) {
t.remove(mDimState.mDimLayer);
}
} else { } else {
startDimExit(mLastRequestedDimContainer, mDimState.mSurfaceAnimator, t); startDimExit(mLastRequestedDimContainer, mDimState.mSurfaceAnimator, t);
} }

5
services/tests/wmtests/src/com/android/server/wm/DimmerTests.java
View File

@@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.when;
import android.graphics.Rect; import android.graphics.Rect;
import android.platform.test.annotations.Presubmit; import android.platform.test.annotations.Presubmit;
@@ -78,7 +79,9 @@ public class DimmerTests extends WindowTestsBase {
@Override @Override
public SurfaceControl build() { public SurfaceControl build() {
return mock(SurfaceControl.class); SurfaceControl mSc = mock(SurfaceControl.class);
when(mSc.isValid()).thenReturn(true);
return mSc;
} }
} }