Merge changes from topic "no_dupe_stuiff_qpr" into qt-qpr1-dev (548869ac) · Commits · e / os / android_frameworks_base

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

+48 −35

Original line number	Diff line number	Diff line
		@@ -9031,7 +9031,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(currentUserId);
		}

		synchronized (this) {
		// Only start up encryption-aware persistent apps; once user is
		@@ -9055,9 +9064,6 @@ 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");
		@@ -9065,6 +9071,7 @@ public class ActivityManagerService extends IActivityManager.Stub

		mAtmInternal.showSystemReadyErrorDialogsIfNeeded();

		if (bootingSystemUser) {
		final int callingUid = Binder.getCallingUid();
		final int callingPid = Binder.getCallingPid();
		long ident = Binder.clearCallingIdentity();
		@@ -9096,8 +9103,14 @@ public class ActivityManagerService extends IActivityManager.Stub
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		} else {
		Slog.i(TAG, "Not sending multi-user broadcasts for non-system user "
		+ currentUserId);
		}
		mAtmInternal.resumeTopActivities(false /* scheduleIdle */);
		if (bootingSystemUser) {
		mUserController.sendUserSwitchBroadcasts(-1, currentUserId);
		}

		BinderInternal.nSetBinderProxyCountWatermarks(BINDER_PROXY_HIGH_WATERMARK,
		BINDER_PROXY_LOW_WATERMARK);