commit f63b89c0a10b4e3220b0a4aa1703be3aed0c5a98
author Fyodor Kupolov <fkupolov@google.com> Tue Oct 27 18:08:56 2015 -0700
committer Fyodor Kupolov <fkupolov@google.com> Tue Nov 03 11:34:47 2015 -0800
tree a61fc3d53958fa1e7f5b4e49c8f4b154898d608e
parent 780318180fa5ce496a45567a063a4ea90acfd10f

UserController refactoring

Addressed comments from the previous cl. Added getters for UserController
fields, direct access is no longer allowed. Moved the following methods:
 - getUserManagerLocked. Became getUserManager() - because locking is not
   necessary, double checked locking will suffice.
 - startUserInForeground /showUserSwitchDialog/sendUserSwitchBroadcastsLocked
 - handleIncomingUser/unsafeConvertIncomingUserLocked/isUserRunningLocked/
   getUsers/getProfileIds

Bug: 24745840
Change-Id: Id5a5cfb9604e08add29bd9a03c8fe5200bc51fef

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 7e47006..b5d3033 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -4659,7 +4659,7 @@
         @Override
         public final int startActivity(Intent intent) {
             mService.enforceNotIsolatedCaller("ActivityContainer.startActivity");
-            final int userId = mService.handleIncomingUser(Binder.getCallingPid(),
+            final int userId = mService.mUserController.handleIncomingUser(Binder.getCallingPid(),
                     Binder.getCallingUid(), mCurrentUser, false,
                     ActivityManagerService.ALLOW_FULL_ONLY, "ActivityContainer", null);
 
@@ -4685,7 +4685,7 @@
                 throw new IllegalArgumentException("Bad PendingIntent object");
             }
 
-            final int userId = mService.handleIncomingUser(Binder.getCallingPid(),
+            final int userId = mService.mUserController.handleIncomingUser(Binder.getCallingPid(),
                     Binder.getCallingUid(), mCurrentUser, false,
                     ActivityManagerService.ALLOW_FULL_ONLY, "ActivityContainer", null);