diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/BackNavigationController.java | 12 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index 1a7c6b70f007..e2499bc0f3ee 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -997,11 +997,9 @@ class BackNavigationController { /** * Handle the pending animation when the running transition finished, all the visibility change * has applied so ready to start pending predictive back animation. - * @param targets The final animation targets derived in transition. * @param finishedTransition The finished transition target. */ - void onTransitionFinish(ArrayList<Transition.ChangeInfo> targets, - @NonNull Transition finishedTransition) { + void onTransitionFinish(@NonNull Transition finishedTransition) { if (isMonitoringPrepareTransition(finishedTransition)) { if (mAnimationHandler.mPrepareCloseTransition == null) { clearBackAnimations(true /* cancel */); @@ -1049,14 +1047,6 @@ class BackNavigationController { return; } - // Ensure the final animation targets which hidden by transition could be visible. - for (int i = 0; i < targets.size(); i++) { - final WindowContainer wc = targets.get(i).mContainer; - if (wc.mSurfaceControl != null) { - wc.prepareSurfaces(); - } - } - // The pending builder could be cleared due to prepareSurfaces // => updateNonSystemOverlayWindowsVisibilityIfNeeded // => setForceHideNonSystemOverlayWindowIfNeeded diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 1f539a129e7d..d08d6f22feef 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1589,7 +1589,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { cleanUpInternal(); // Handle back animation if it's already started. - mController.mAtm.mBackNavigationController.onTransitionFinish(mTargets, this); + mController.mAtm.mBackNavigationController.onTransitionFinish(this); mController.mFinishingTransition = null; mController.mSnapshotController.onTransitionFinish(mType, mTargets); // Resume snapshot persist thread after snapshot controller analysis this transition. |