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

Commit 1c62f7b2 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Attempts fixing test flakiness" into main

parents 3bc29752 aa2316db

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

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

     */

    void endDeferResume() {

    void endDeferResume() {

        mDeferResumeCount--;

        mDeferResumeCount--;

        if (readyToResume() && mLastReportedTopResumedActivity != null

        if (readyToResume()) {

            if (mLastReportedTopResumedActivity != null

                    && mTopResumedActivity != mLastReportedTopResumedActivity) {

                    && mTopResumedActivity != mLastReportedTopResumedActivity) {

                scheduleTopResumedActivityStateLossIfNeeded();

                scheduleTopResumedActivityStateLossIfNeeded();

            } else if (mLastReportedTopResumedActivity == null) {

                scheduleTopResumedActivityStateIfNeeded();

            }

        }

        }

    }

    }