From 64643f6dcd261c4bf1a1856bb9ad303e96aab039 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 31 Jan 2019 15:15:33 -0800 Subject: Only check isTopOfTask() when needed This avoids unnecessary binder call to system Test: Verified on device Change-Id: I5258550c8fbe837acc93e89f21a44464a00c7d6e --- core/java/android/app/Activity.java | 2 +- core/java/android/app/ActivityTransitionState.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/java/android') 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 { -- cgit v1.2.3