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

Commit f1204289 authored by Evan Rosky's avatar Evan Rosky
Browse files

Fix shell-transit to legacy app-cancel metrics 

When it performs a no-op, it should notify metrics-logger of
activity launch cancellations. Was blindly reporting everything
to start, now just report visible stuff.

This also fixes a problem during teardown where transition
collection wasn't waiting for pending pause.

Bug: 183993924
Test: atest ActivityMetricsLoggerTests
Change-Id: Ie0d4aea89b7e32744fdbd56a39d6266154015d32
parent 92b32639

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

+2 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,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