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

Commit 6663bc11 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Don't carry out resuming activity in TaskFragment if not ready." into main

parents 3a0d362b 01be5cd2

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

+4 −0
Original line number Diff line number Diff line
@@ -5255,6 +5255,10 @@ class Task extends TaskFragment { 
            return false;

        }



        if (!mTaskSupervisor.readyToResume()) {

            return false;

        }



        final ActivityRecord topActivity = topRunningActivity(true /* focusableOnly */);

        if (topActivity == null) {

            // There are no activities left in this task, let's look somewhere else.