Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d62fba authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Set focus to launcher activity on return."

parents 8f5e3d13 a8a90e0f

services/java/com/android/server/am/ActivityStackSupervisor.java

+3 −1
Original line number Diff line number Diff line
@@ -259,7 +259,9 @@ public final class ActivityStackSupervisor { 
        if (prev != null) {

            prev.mLaunchHomeTaskNext = false;

        }

        if (mHomeStack.topRunningActivityLocked(null) != null) {

        ActivityRecord r = mHomeStack.topRunningActivityLocked(null);

        if (r != null) {

            mService.setFocusedActivityLocked(r);

            return resumeTopActivitiesLocked(mHomeStack, prev, null);

        }

        return mService.startHomeActivityLocked(mCurrentUser);