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

Commit 18e0df16 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev am: a58013ae" into qt-qpr1-dev-plus-aosp
parents cfde3d9a 5215cc0b
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -9055,7 +9055,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();