Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for amInternal nullness on user.dump()" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-30 23:43:03 +00:00
committed by Android (Google) Code Review
parent d505667f65 5b8dc76c0e
commit fc07949b31
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -3898,9 +3898,14 @@ public class UserManagerService extends IUserManager.Stub {
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) {