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

Commit b05a13af authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Check resumed state of activity before skipping resuming" into udc-dev

parents ce28981b d8e1d912

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

+2 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import static com.android.server.wm.ActivityInterceptorCallback.MAINLINE_LAST_OR 
import static com.android.server.wm.ActivityInterceptorCallback.SYSTEM_FIRST_ORDERED_ID;

import static com.android.server.wm.ActivityInterceptorCallback.SYSTEM_LAST_ORDERED_ID;

import static com.android.server.wm.ActivityRecord.State.PAUSING;

import static com.android.server.wm.ActivityRecord.State.RESUMED;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_ROOT_TASK;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_SWITCH;
@@ -2011,7 +2012,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            return;

        }



        if (r == mRootWindowContainer.getTopResumedActivity()) {

        if (r.isState(RESUMED) && r == mRootWindowContainer.getTopResumedActivity()) {

            setLastResumedActivityUncheckLocked(r, "setFocusedTask-alreadyTop");

            return;

        }