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

Commit 1b390664 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Dump user id in dumpsys activity starter" into oc-dev am: b55b8428 am: e30da86a 

am: 9842dec6

Change-Id: I76813be6d41381ef616270a71df34ea2507639c6
parents 685c3450 9842dec6

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

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

                    aInfo.applicationInfo.uid, true);

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

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

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

                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 {

        } else {

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

            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 Original line Diff line number Diff line
@@ -2308,6 +2308,7 @@ class ActivityStarter { 
        pw.println(prefix + "ActivityStarter:");

        pw.println(prefix + "ActivityStarter:");

        prefix = prefix + "  ";

        prefix = prefix + "  ";





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

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

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

        pw.println(prefix + "mLastStartActivityTimeMs="

        pw.println(prefix + "mLastStartActivityTimeMs="

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

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