Merge "Also check idle to handle stopping activities" into sc-dev

This commit is contained in:
Riddle Hsu
2021-04-22 08:52:10 +00:00
committed by Android (Google) Code Review

View File

@@ -2118,8 +2118,14 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
}
void scheduleProcessStoppingAndFinishingActivitiesIfNeeded() {
if ((!mStoppingActivities.isEmpty() || !mFinishingActivities.isEmpty())
&& !mHandler.hasMessages(PROCESS_STOPPING_AND_FINISHING_MSG)
if (mStoppingActivities.isEmpty() && mFinishingActivities.isEmpty()) {
return;
}
if (mRootWindowContainer.allResumedActivitiesIdle()) {
scheduleIdle();
return;
}
if (!mHandler.hasMessages(PROCESS_STOPPING_AND_FINISHING_MSG)
&& mRootWindowContainer.allResumedActivitiesVisible()) {
mHandler.sendEmptyMessage(PROCESS_STOPPING_AND_FINISHING_MSG);
}