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

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

Merge "Dump user id in dumpsys activity starter" into oc-dev

parents 2ef19c1d 454117fe

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

+5 −1
Original line number Diff line number Diff line
@@ -4064,7 +4064,11 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    aInfo.applicationInfo.uid, true);

            if (app == null || app.instr == null) {

                intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);

                mActivityStarter.startHomeActivityLocked(intent, aInfo, reason);

                final int resolvedUserId = UserHandle.getUserId(aInfo.applicationInfo.uid);

                // For ANR debugging to verify if the user activity is the one that actually

                // launched.

                final String myReason = reason + ":" + userId + ":" + resolvedUserId;

                mActivityStarter.startHomeActivityLocked(intent, aInfo, myReason);

            }

        } else {

            Slog.wtf(TAG, "No home screen found for " + intent, new Throwable());

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

+1 −0
Original line number Diff line number Diff line
@@ -2308,6 +2308,7 @@ class ActivityStarter { 
        pw.println(prefix + "ActivityStarter:");

        prefix = prefix + "  ";



        pw.println(prefix + "mCurrentUser=" + mSupervisor.mCurrentUser);

        pw.println(prefix + "mLastStartReason=" + mLastStartReason);

        pw.println(prefix + "mLastStartActivityTimeMs="

                + DateFormat.getDateTimeInstance().format(new Date(mLastStartActivityTimeMs)));