From 77551ed30d007611b78a849de25a8ff75d9560b4 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Mon, 29 Apr 2019 12:42:19 +0800 Subject: Revert part of ag/6685504 We don't actually need to post a message here because the same message was scheduled to resume the top activities for that case in ActivityStartController#startHomeActivity(). Bug: 131401344 Bug: 126747441 Test: MultiDisplayPolicyTests Test: DeviceOwnerTest Change-Id: I347134eb4246eccf308c658bd71109ba969cb78c --- .../core/java/com/android/server/wm/ActivityStack.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java index 4ed07c351847..d7a518539deb 100644 --- a/services/core/java/com/android/server/wm/ActivityStack.java +++ b/services/core/java/com/android/server/wm/ActivityStack.java @@ -3051,21 +3051,7 @@ class ActivityStack extends ConfigurationContainer { ActivityOptions.abort(options); if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityInNextFocusableStack: " + reason + ", go home"); - if (isActivityTypeHome()) { - // resumeTopActivityUncheckedLocked has been prevented to run recursively. Post a - // runnable to resume home since we are currently in the process of resuming top - // activity in home stack. - // See {@link #mInResumeTopActivity}. - mService.mH.post( - () -> { - synchronized (mService.mGlobalLock) { - mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId); - } - }); - return true; - } else { - return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId); - } + return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId); } /** Returns the position the input task should be placed in this stack. */ -- cgit v1.2.3-59-g8ed1b