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

Commit 23e4f9d4 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I06e109452af887ac416f43b760b07c7c225bfea6
parents 47fa7494 bfe16934

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

+2 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 


            } else {

                prev.schedulePauseTimeout();

                // Unset readiness since we now need to wait until this pause is complete.

                mAtmService.getTransitionController().setReady(this, false /* ready */);

                return true;

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
        ArrayMap<WindowContainer, Integer> reasons = new ArrayMap<>();

        for (int i = mParticipants.size() - 1; i >= 0; --i) {

            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

            // ready due to starting-window.

            reasons.put(r, (r.mStartingData instanceof SplashScreenStartingData