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

Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-26 09:28:08 +00:00
committed by Gerrit Code Review
parent bb8954df3b b9932b66e6
commit dbe9e763fa
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -3703,13 +3703,19 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
.show(mSplitScreenDividerAnchor);
scheduleAnimation();
} else {
mAppAnimationLayer.destroy();
// At this time mBoostedAppAnimationLayer may be used for animating,
// and ResizeableActivity is in it. mBoostedAppAnimationLayer.destroy()
// can also destroy the surface of ResizeableActivity, but the surface will
// be used after. So change to use transaction to call destroy to delay it,
// and ResizeableActivity is not in mBoostedAppAnimationLayer.
getPendingTransaction()
.destroy(mAppAnimationLayer)
.destroy(mBoostedAppAnimationLayer)
.destroy(mHomeAppAnimationLayer)
.destroy(mSplitScreenDividerAnchor);
mAppAnimationLayer = null;
mBoostedAppAnimationLayer.destroy();
mBoostedAppAnimationLayer = null;
mHomeAppAnimationLayer.destroy();
mHomeAppAnimationLayer = null;
mSplitScreenDividerAnchor.destroy();
mSplitScreenDividerAnchor = null;
}
}