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

Commit 136c82ed authored by Louis Chang's avatar Louis Chang
Browse files

Log for pending activities launch 

We were not logging for the pending activities launch
while it should.

Bug: 130169434
Test: having an app to start activity after press the
      home button and inspect log

Change-Id: Ifcfad9a3c9f4fd1c4b154c57ca03c7ad75b1b1a5
parent c53df3a9

services/core/java/com/android/server/wm/ActivityStartController.java

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ public class ActivityStartController { 
                    "pendingActivityLaunch");

            try {

                starter.startResolvedActivity(pal.r, pal.sourceRecord, null, null, pal.startFlags,

                        resume, pal.r.pendingOptions, null, null /* outRecords */);

                        resume, pal.r.pendingOptions, null);

            } catch (Exception e) {

                Slog.e(TAG, "Exception during pending activity launch pal=" + pal, e);

                pal.sendErrorResult(e.getMessage());

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

+10 −4
Original line number Diff line number Diff line
@@ -544,11 +544,17 @@ class ActivityStarter { 
     */

    int startResolvedActivity(final ActivityRecord r, ActivityRecord sourceRecord,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

            int startFlags, boolean doResume, ActivityOptions options, TaskRecord inTask,

            ActivityRecord[] outActivity) {

            int startFlags, boolean doResume, ActivityOptions options, TaskRecord inTask) {

        try {

            return startActivity(r, sourceRecord, voiceSession, voiceInteractor, startFlags,

                    doResume, options, inTask, outActivity);

            mSupervisor.getActivityMetricsLogger().notifyActivityLaunching(r.intent);

            mLastStartReason = "startResolvedActivity";

            mLastStartActivityTimeMs = System.currentTimeMillis();

            mLastStartActivityRecord[0] = r;

            mLastStartActivityResult = startActivity(r, sourceRecord, voiceSession, voiceInteractor,

                    startFlags, doResume, options, inTask, mLastStartActivityRecord);

            mSupervisor.getActivityMetricsLogger().notifyActivityLaunched(mLastStartActivityResult,

                    mLastStartActivityRecord[0]);

            return mLastStartActivityResult;

        } finally {

            onExecutionComplete();

        }

services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class ActivityStartControllerTests extends ActivityTestsBase { 
        mController.doPendingActivityLaunches(resume);



        verify(mStarter, times(1)).startResolvedActivity(eq(activity), eq(source), eq(null),

                eq(null), eq(startFlags), eq(resume), eq(null), eq(null), eq(null));

                eq(null), eq(startFlags), eq(resume), eq(null), eq(null));

    }