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

Merge "More SurfaceAnimator lifetime fixes." into qt-dev

Browse Source 
am: ed5d40cf26

Change-Id: Iea26915848f87f0c905491abb6aaa5968c84ca94
This commit is contained in:
Rob Carr
2019-04-15 13:11:40 -07:00
committed by android-build-merger
parent b73f0f5b8a ed5d40cf26
commit 5314f79bd9
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ class Dimmer {
private static final int DEFAULT_DIM_ANIM_DURATION = 200; private static final int DEFAULT_DIM_ANIM_DURATION = 200;
private class DimAnimatable implements SurfaceAnimator.Animatable { private class DimAnimatable implements SurfaceAnimator.Animatable {
private final SurfaceControl mDimLayer; private SurfaceControl mDimLayer;
private DimAnimatable(SurfaceControl dimLayer) { private DimAnimatable(SurfaceControl dimLayer) {
mDimLayer = dimLayer; mDimLayer = dimLayer;
@@ -100,6 +100,11 @@ class Dimmer {
// See getSurfaceWidth() above for explanation. // See getSurfaceWidth() above for explanation.
return mHost.getSurfaceHeight(); return mHost.getSurfaceHeight();
} }
void removeSurface() {
getPendingTransaction().remove(mDimLayer);
mDimLayer = null;
}
} }
@VisibleForTesting @VisibleForTesting
@@ -129,8 +134,7 @@ class Dimmer {
final DimAnimatable dimAnimatable = new DimAnimatable(dimLayer); final DimAnimatable dimAnimatable = new DimAnimatable(dimLayer);
mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> { mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> {
if (!mDimming) { if (!mDimming) {
dimAnimatable.getPendingTransaction().remove(mDimLayer); dimAnimatable.removeSurface();
mDimLayer = null;
} }
}, mHost.mWmService); }, mHost.mWmService);
} }

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

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