Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-26 20:57:28 +00:00
committed by Android (Google) Code Review
parent 8e24ea2b4c 0639751675
commit a58013ae18
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -9047,7 +9047,13 @@ public class ActivityManagerService extends IActivityManager.Stub
throw e.rethrowAsRuntimeException();
}
}
mAtmInternal.startHomeOnAllDisplays(currentUserId, "systemReady");
// 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();