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

Commit aa2316db authored by Louis Chang's avatar Louis Chang
Browse files

Attempts fixing test flakiness 

Check and report top-resume-activity-gain after defer-resume stopped.

Bug: 402426962
Test: ActivityLifecycleTopResumedStateTests
Flag: EXEMPT bugfix
Change-Id: Iededa19cb308fd787aa428e5cb36f25af7459bf9
parent afbdde0d

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

+7 −3
Original line number Diff line number Diff line
@@ -2639,9 +2639,13 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
     */

    void endDeferResume() {

        mDeferResumeCount--;

        if (readyToResume() && mLastReportedTopResumedActivity != null

        if (readyToResume()) {

            if (mLastReportedTopResumedActivity != null

                    && mTopResumedActivity != mLastReportedTopResumedActivity) {

                scheduleTopResumedActivityStateLossIfNeeded();

            } else if (mLastReportedTopResumedActivity == null) {

                scheduleTopResumedActivityStateIfNeeded();

            }

        }

    }