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

Merge "Fix shell-transit to legacy app-cancel metrics" into sc-v2-dev am: bfe16934ec

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

Change-Id: I06e109452af887ac416f43b760b07c7c225bfea6
This commit is contained in:
Evan Rosky
2021-08-04 21:58:36 +00:00
committed by Automerger Merge Worker
parent 47fa7494af bfe16934ec
commit 23e4f9d4da
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1398,6 +1398,8 @@ class TaskFragment extends WindowContainer<WindowContainer> {
} else { } else {
prev.schedulePauseTimeout(); prev.schedulePauseTimeout();
// Unset readiness since we now need to wait until this pause is complete.
mAtmService.getTransitionController().setReady(this, false /* ready */);
return true; return true;
} }

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

@@ -657,7 +657,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
ArrayMap<WindowContainer, Integer> reasons = new ArrayMap<>(); ArrayMap<WindowContainer, Integer> reasons = new ArrayMap<>();
for (int i = mParticipants.size() - 1; i >= 0; --i) { for (int i = mParticipants.size() - 1; i >= 0; --i) {
ActivityRecord r = mParticipants.valueAt(i).asActivityRecord(); ActivityRecord r = mParticipants.valueAt(i).asActivityRecord();
if (r == null) continue; if (r == null || !r.mVisibleRequested) continue;
// At this point, r is "ready", but if it's not "ALL ready" then it is probably only // At this point, r is "ready", but if it's not "ALL ready" then it is probably only
// ready due to starting-window. // ready due to starting-window.
reasons.put(r, (r.mStartingData instanceof SplashScreenStartingData reasons.put(r, (r.mStartingData instanceof SplashScreenStartingData