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

Commit da251e98 authored by Louis Chang's avatar Louis Chang Committed by android-build-merger
Browse files

Merge "Log for pending activities launch" into qt-dev am: 07277977 

am: 2e03e241

Change-Id: I1157ec56b598f57ca2eeb66b6aa2fe0db500c97a
parents 42bf144e 2e03e241

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

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

                    "pendingActivityLaunch");

            try {

            try {

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

                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) {

            } catch (Exception e) {

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

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

                pal.sendErrorResult(e.getMessage());

                pal.sendErrorResult(e.getMessage());

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

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

     */

    int startResolvedActivity(final ActivityRecord r, ActivityRecord sourceRecord,

    int startResolvedActivity(final ActivityRecord r, ActivityRecord sourceRecord,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

            IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,

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

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

            ActivityRecord[] outActivity) {

        try {

        try {

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

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

                    doResume, options, inTask, outActivity);

            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 {

        } finally {

            onExecutionComplete();

            onExecutionComplete();

        }

        }

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

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

        mController.doPendingActivityLaunches(resume);





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

        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));

    }

    }