Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log for pending activities launch" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 01:41:41 +00:00
committed by Android (Google) Code Review
parent 805c739ada 136c82edb6
commit 0727797765
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityStartController.java
View File

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

14
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -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();
}

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

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