Merge "Don't start first human user twice on headless-system mode." (04e80fa6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -9163,7 +9163,16 @@ public class ActivityManagerService extends IActivityManager.Stub
		Integer.toString(currentUserId), currentUserId);
		mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_START,
		Integer.toString(currentUserId), currentUserId);

		// 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.
		// TODO(b/132262830): this workdound shouldn't be necessary once we move the
		// headless-user start logic to UserManager-land
		final boolean bootingSystemUser = currentUserId == UserHandle.USER_SYSTEM;

		if (bootingSystemUser) {
		mSystemServiceManager.startUser(t, currentUserId);
		}

		synchronized (this) {
		// Only start up encryption-aware persistent apps; once user is
		@@ -9192,12 +9201,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		t.traceEnd();
		}

		// 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.
		// TODO(b/132262830): this workdound shouldn't be necessary once we move the
		// headless-user start logic to UserManager-land
		final boolean bootingSystemUser = currentUserId == UserHandle.USER_SYSTEM;

		if (bootingSystemUser) {
		t.traceBegin("startHomeOnAllDisplays");
		mAtmInternal.startHomeOnAllDisplays(currentUserId, "systemReady");