Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f15d227 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails" into pie-gsi

parents aa704a30 0f3d6534
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -3704,13 +3704,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;
            }
        }