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

Merge "Avoid potential NPE if the restore-below task is not collected" into tm-qpr-dev am: 0fb2fcc716

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18832548

Change-Id: Ic65d4a98bf75f73e0f673f277334154e146b07d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-06-14 16:04:53 +00:00
committed by Automerger Merge Worker
parent 2127454034 0fb2fcc716
commit b5ebf53bde
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1660,14 +1660,17 @@ class ActivityStarter {
transitionController.collect(r); transitionController.collect(r);
try { try {
mService.deferWindowLayout(); mService.deferWindowLayout();
Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startActivityInner"); try {
result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor, Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startActivityInner");
startFlags, doResume, options, inTask, inTaskFragment, restrictedBgActivity, result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor,
intentGrants); startFlags, doResume, options, inTask, inTaskFragment, restrictedBgActivity,
intentGrants);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
startedActivityRootTask = handleStartResult(r, options, result, newTransition,
remoteTransition);
}
} finally { } finally {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
startedActivityRootTask = handleStartResult(r, options, result, newTransition,
remoteTransition);
mService.continueWindowLayout(); mService.continueWindowLayout();
} }
postStartActivityProcessing(r, result, startedActivityRootTask); postStartActivityProcessing(r, result, startedActivityRootTask);

4
services/core/java/com/android/server/wm/Transition.java
View File

@@ -229,7 +229,9 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
if (restoreBelow != null) { if (restoreBelow != null) {
final ChangeInfo info = mChanges.get(restoreBelow); final ChangeInfo info = mChanges.get(restoreBelow);
info.mFlags |= ChangeInfo.FLAG_ABOVE_TRANSIENT_LAUNCH; if (info != null) {
info.mFlags |= ChangeInfo.FLAG_ABOVE_TRANSIENT_LAUNCH;
}
} }
ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Transition %d: Set %s as " ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Transition %d: Set %s as "
+ "transient-launch", mSyncId, activity); + "transient-launch", mSyncId, activity);