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

Commit a58013ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev

parents 8e24ea2b 06397516
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -9047,7 +9047,13 @@ public class ActivityManagerService extends IActivityManager.Stub
                    throw e.rethrowAsRuntimeException();
                }
            }
            // On Automotive, at this point the system user has already been started and unlocked,
            // and some of the tasks we do here have already been done. So skip those in that case.
            final boolean bootingSystemUser = currentUserId == UserHandle.USER_SYSTEM;
            if (bootingSystemUser) {
                mAtmInternal.startHomeOnAllDisplays(currentUserId, "systemReady");
            }
            mAtmInternal.showSystemReadyErrorDialogsIfNeeded();