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

Commit aa3156a9 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22368908



Change-Id: I7307074c710fa3e3a8dab5a8031ddc2fda15d0e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 371958d3 b05a13af

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;

        }