diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index f3e1fc3a96151..dedc8e512e15e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3328,17 +3328,6 @@ public final class ActivityThread { } r.activity.performResume(); - // If there is a pending relaunch that was requested when the activity was paused, - // it will put the activity into paused state when it finally happens. Since the - // activity resumed before being relaunched, we don't want that to happen, so we - // need to clear the request to relaunch paused. - for (int i = mRelaunchingActivities.size() - 1; i >= 0; i--) { - final ActivityClientRecord relaunching = mRelaunchingActivities.get(i); - if (relaunching.token == r.token && relaunching.startsNotResumed) { - relaunching.startsNotResumed = false; - } - } - EventLog.writeEvent(LOG_AM_ON_RESUME_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName()); @@ -3567,7 +3556,6 @@ public final class ActivityThread { private void handlePauseActivity(IBinder token, boolean finished, boolean userLeaving, int configChanges, boolean dontReport, int seq) { ActivityClientRecord r = mActivities.get(token); - if (DEBUG_ORDER) Slog.d(TAG, "handlePauseActivity " + r + ", seq: " + seq); if (!checkAndUpdateLifecycleSeq(seq, r, "pauseActivity")) { return; } @@ -4207,7 +4195,6 @@ public final class ActivityThread { synchronized (mResourcesManager) { for (int i=0; i