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

Commit 31dc2cb6 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Log last home activity and result we tried to start" into oc-dev am: e8f1a743 

am: a7bf2a0e

Change-Id: I15f45b209c12fc7e70f3bf9b6a2fda9ddf50cc2a
parents f1854c06 a7bf2a0e

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -24079,6 +24079,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
                if (reason != null) {

                if (reason != null) {

                    pw.println("  Reason: " + reason);

                    pw.println("  Reason: " + reason);

                }

                }

                pw.println("  mLastHomeActivityStartResult: "

                        + mActivityStarter.mLastHomeActivityStartResult);

                final ActivityRecord r = mActivityStarter.mLastHomeActivityStartRecord[0];

                if (r != null) {

                    pw.println("  mLastHomeActivityStartRecord:");

                    r.dump(pw, "   ");

                }

                pw.println();

                pw.println();

                dumpActivitiesLocked(null /* fd */, pw, null /* args */, 0 /* opti */,

                dumpActivitiesLocked(null /* fd */, pw, null /* args */, 0 /* opti */,

                        true /* dumpAll */, false /* dumpClient */, null /* dumpPackage */,

                        true /* dumpAll */, false /* dumpClient */, null /* dumpPackage */,

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

+12 −6
Original line number Original line Diff line number Diff line
@@ -188,6 +188,11 @@ class ActivityStarter { 




    private boolean mUsingVr2dDisplay;

    private boolean mUsingVr2dDisplay;





    // Last home activity record we attempted to start

    final ActivityRecord[] mLastHomeActivityStartRecord = new ActivityRecord[1];

    // The result of the last home activity we attempted to start.

    int mLastHomeActivityStartResult;



    private void reset() {

    private void reset() {

        mStartActivity = null;

        mStartActivity = null;

        mIntent = null;

        mIntent = null;
@@ -592,12 +597,13 @@ class ActivityStarter { 




    void startHomeActivityLocked(Intent intent, ActivityInfo aInfo, String reason) {

    void startHomeActivityLocked(Intent intent, ActivityInfo aInfo, String reason) {

        mSupervisor.moveHomeStackTaskToTop(reason);

        mSupervisor.moveHomeStackTaskToTop(reason);

        startActivityLocked(null /*caller*/, intent, null /*ephemeralIntent*/,

        mLastHomeActivityStartResult = startActivityLocked(null /*caller*/, intent,

                null /*resolvedType*/, aInfo, null /*rInfo*/, null /*voiceSession*/,

                null /*ephemeralIntent*/, null /*resolvedType*/, aInfo, null /*rInfo*/,

                null /*voiceInteractor*/, null /*resultTo*/, null /*resultWho*/,

                null /*voiceSession*/, null /*voiceInteractor*/, null /*resultTo*/,

                0 /*requestCode*/, 0 /*callingPid*/, 0 /*callingUid*/, null /*callingPackage*/,

                null /*resultWho*/, 0 /*requestCode*/, 0 /*callingPid*/, 0 /*callingUid*/,

                0 /*realCallingPid*/, 0 /*realCallingUid*/, 0 /*startFlags*/, null /*options*/,

                null /*callingPackage*/, 0 /*realCallingPid*/, 0 /*realCallingUid*/,

                false /*ignoreTargetSecurity*/, false /*componentSpecified*/, null /*outActivity*/,

                0 /*startFlags*/, null /*options*/, false /*ignoreTargetSecurity*/,

                false /*componentSpecified*/, mLastHomeActivityStartRecord /*outActivity*/,

                null /*container*/, null /*inTask*/);

                null /*container*/, null /*inTask*/);

        if (mSupervisor.inResumeTopActivity) {

        if (mSupervisor.inResumeTopActivity) {

            // If we are in resume section already, home activity will be initialized, but not

            // If we are in resume section already, home activity will be initialized, but not