Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc07949b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d505667f 5b8dc76c
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -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) {