am a245f91c: Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev
* commit 'a245f91caed3dc2c073f152f0e371d8b27c43184':
Fix SetupWizard crash when creating Guest or Restricted profile
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1acbec7..f315b74 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17560,7 +17560,7 @@
d.show();
}
- private boolean startUser(final int userId, boolean foreground) {
+ private boolean startUser(final int userId, final boolean foreground) {
if (checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
String msg = "Permission Denial: switchUser() from pid="
@@ -17684,7 +17684,7 @@
public void performReceive(Intent intent, int resultCode,
String data, Bundle extras, boolean ordered,
boolean sticky, int sendingUser) {
- userInitialized(uss, userId);
+ onUserInitialized(uss, foreground, oldUserId, userId);
}
}, 0, null, null, null, AppOpsManager.OP_NONE,
true, false, MY_PID, Process.SYSTEM_UID,
@@ -17696,15 +17696,9 @@
}
if (foreground) {
- boolean homeInFront = mStackSupervisor.switchUserLocked(userId, uss);
- if (homeInFront) {
- startHomeActivityLocked(userId);
- } else {
- mStackSupervisor.resumeTopActivitiesLocked();
+ if (!uss.initializing) {
+ moveUserToForeground(uss, oldUserId, userId);
}
- EventLogTags.writeAmSwitchUser(userId);
- getUserManagerLocked().userForeground(userId);
- sendUserSwitchBroadcastsLocked(oldUserId, userId);
} else {
mStackSupervisor.startBackgroundUserLocked(userId, uss);
}
@@ -17830,10 +17824,28 @@
oldUserId, newUserId, uss));
}
- void userInitialized(UserStartedState uss, int newUserId) {
+ void onUserInitialized(UserStartedState uss, boolean foreground, int oldUserId, int newUserId) {
+ synchronized (this) {
+ if (foreground) {
+ moveUserToForeground(uss, oldUserId, newUserId);
+ }
+ }
+
completeSwitchAndInitalize(uss, newUserId, true, false);
}
+ void moveUserToForeground(UserStartedState uss, int oldUserId, int newUserId) {
+ boolean homeInFront = mStackSupervisor.switchUserLocked(newUserId, uss);
+ if (homeInFront) {
+ startHomeActivityLocked(newUserId);
+ } else {
+ mStackSupervisor.resumeTopActivitiesLocked();
+ }
+ EventLogTags.writeAmSwitchUser(newUserId);
+ getUserManagerLocked().userForeground(newUserId);
+ sendUserSwitchBroadcastsLocked(oldUserId, newUserId);
+ }
+
void continueUserSwitch(UserStartedState uss, int oldUserId, int newUserId) {
completeSwitchAndInitalize(uss, newUserId, false, true);
}