Merge "Revert part of ag/6685504" into qt-dev

1 files changed, 1 insertions, 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 c4aef30be2ca..fe99fd20b855 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -3055,21 +3055,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. */