commit 86b7446c2be77eb7f3638c98e1d554b3ab647d40
author Wale Ogunwale <ogunwale@google.com> Mon Jul 02 08:42:43 2018 -0700
committer Wale Ogunwale <ogunwale@google.com> Tue Jul 03 08:22:59 2018 -0700
tree 83f4523ce10ed8fd76a0352f074ef6fcc741f565
parent 9333840e902a335ffa5e2fcfc08b56f2c2d993a7

Break direct calls to UserController object in AMS from activity classes (12/n)

Make calls from activity classes go through ActivityManagerInternal
interface to case UserController instead of calling AMS.mUserController
object directly. Note that calls to UserController should not hold the
AMS lock.

Bug: 80414790
Test: Existing tests pass
Change-Id: Ie56f08d10b62d609e9b5e31f45b5f0d6eed3a9d4

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

diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
index 50d0212..3ed2875 100644
--- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
@@ -4547,9 +4547,9 @@
         return mShowDialogs && !mSleeping && !mShuttingDown
                 && !mKeyguardController.isKeyguardOrAodShowing(DEFAULT_DISPLAY)
                 && !hasUserRestriction(UserManager.DISALLOW_SYSTEM_ERROR_DIALOGS,
-                mAm.mUserController.getCurrentUserId())
+                mAmInternal.getCurrentUserId())
                 && !(UserManager.isDeviceInDemoMode(mContext)
-                && mAm.mUserController.getCurrentUser().isDemo());
+                && mAmInternal.getCurrentUser().isDemo());
     }
 
     /**