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

Commit e34af281 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: a58013ae

Change-Id: I2ce91cd7ee0a8039b6b53924ff857c414da57250
parents 72b14863 a58013ae
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();