diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 28c99c70ae0c..9eec5f8c4bb6 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -3386,7 +3386,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A rootTask.moveToFront(reason, task); // Report top activity change to tracking services and WM - if (mRootWindowContainer.getTopResumedActivity() == this) { + if (mState == RESUMED && mRootWindowContainer.getTopResumedActivity() == this) { mAtmService.setLastResumedActivityUncheckLocked(this, reason); } return true; diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java index bb20244aee91..b44d52e97d1c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java @@ -296,7 +296,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase { .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW).build(); final ActivityRecord activity1 = new ActivityBuilder(mAtm) .setTask(task1).setUid(ActivityBuilder.DEFAULT_FAKE_UID + 1).build(); - task1.setResumedActivity(activity1, "test"); + activity1.setState(ActivityRecord.State.RESUMED, "test"); final ActivityRecord activity2 = new TaskBuilder(mSupervisor) .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW) |