commit 5b8dc76c0effa3380dc6c0efe47ca558d2854857
author Felipe Leme <felipeal@google.com> Fri Oct 04 16:23:16 2019 -0700
committer Felipe Leme <felipeal@google.com> Tue Oct 29 18:02:48 2019 +0000
tree 29bc3923d568a4a697f792ff741013e4a493df88
parent 5284336decfc40803166fb6fe4999bb915e48aac

Check for amInternal nullness on user.dump()

Bug: 133242016
Test: manual verification

Change-Id: I4f669c94b0be5f15465446cf768d16e483b440a4

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 338811e..62562a2 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -3897,9 +3897,14 @@
         long now = System.currentTimeMillis();
         final long nowRealtime = SystemClock.elapsedRealtime();
 
-        final int currentUser = LocalServices.getService(ActivityManagerInternal.class)
-                .getCurrentUserId();
-        pw.print("Current user: "); pw.println(currentUser);
+        final ActivityManagerInternal amInternal = LocalServices
+                .getService(ActivityManagerInternal.class);
+        pw.print("Current user: ");
+        if (amInternal != null) {
+            pw.println(amInternal.getCurrentUserId());
+        } else {
+            pw.println("N/A");
+        }
 
         StringBuilder sb = new StringBuilder();
         synchronized (mPackagesLock) {