diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/ActivityTransitionState.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index e77e212cb46e..aac8f0855ca9 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1768,7 +1768,7 @@ public class Activity extends ContextThemeWrapper protected void onResume() { if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this); dispatchActivityResumed(); - mActivityTransitionState.onResume(this, isTopOfTask()); + mActivityTransitionState.onResume(this); enableAutofillCompatibilityIfNeeded(); if (mAutoFillResetNeeded) { if (!mAutoFillIgnoreFirstResumePause) { diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java index 3201febec8da..3a95839d2d12 100644 --- a/core/java/android/app/ActivityTransitionState.java +++ b/core/java/android/app/ActivityTransitionState.java @@ -258,10 +258,10 @@ class ActivityTransitionState { } } - public void onResume(Activity activity, boolean isTopOfTask) { + public void onResume(Activity activity) { // After orientation change, the onResume can come in before the top Activity has // left, so if the Activity is not top, wait a second for the top Activity to exit. - if (isTopOfTask || mEnterTransitionCoordinator == null) { + if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) { restoreExitedViews(); restoreReenteringViews(); } else { |