diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/AsyncRotationController.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/BackNavigationController.java | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/AsyncRotationController.java b/services/core/java/com/android/server/wm/AsyncRotationController.java index f0a6e9ec1d4f..dd1af0a497ca 100644 --- a/services/core/java/com/android/server/wm/AsyncRotationController.java +++ b/services/core/java/com/android/server/wm/AsyncRotationController.java @@ -653,7 +653,9 @@ class AsyncRotationController extends FadeAnimationController implements Consume // by drawing the rotated content before applying projection transaction of display. // And it will fade in after the display transition is finished. if (mTransitionOp == OP_APP_SWITCH && !mIsStartTransactionCommitted - && canBeAsync(w.mToken) && !mDisplayContent.hasFixedRotationTransientLaunch()) { + && canBeAsync(w.mToken) && !mDisplayContent.hasFixedRotationTransientLaunch() + && !mService.mAtmService.mBackNavigationController.hasFixedRotationAnimation( + mDisplayContent)) { hideImmediately(w.mToken, Operation.ACTION_FADE); if (DEBUG) Slog.d(TAG, "Hide on finishDrawing " + w.mToken.getTopChild()); } diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index 4ed8b09cd652..3968b525f11d 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -622,6 +622,15 @@ class BackNavigationController { } } + boolean hasFixedRotationAnimation(@NonNull DisplayContent displayContent) { + if (!mAnimationHandler.mComposed) { + return false; + } + final ActivityRecord openActivity = mAnimationHandler.mOpenActivities[0]; + return displayContent == openActivity.mDisplayContent + && displayContent.isFixedRotationLaunchingApp(openActivity); + } + private boolean isWaitBackTransition() { // Ignore mWaitTransition while flag is enabled. return mAnimationHandler.mComposed && (Flags.migratePredictiveBackTransition() |