summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tim Murray <timmurray@google.com> 2022-12-13 16:04:55 -0800
committer Tim Murray <timmurray@google.com> 2022-12-17 10:44:21 -0800
commitf45df50bdb5c0979c481737c810cc2deaee8c278 (patch)
treed02f4c9a6a1c5c923d37a610d8a5d515e2dd8b97
parent8e2fe2566d5a93cfb86b0fc6cdc56edc4bfa1ebc (diff)
ActivityTaskManagerService: clear previous if it becomes topApp
The same app shouldn't be top and previous. When topApp changes, if the same app is previous, clear previous. Test: atest WmTests:WindowStateTests Bug: 262213347 Change-Id: Ia0e3fd2adf1c9c16e8d24b89785d6cd33f74d962
-rw-r--r--services/core/java/com/android/server/wm/ActivityTaskManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index e475eb6e992c..937f2f1c1a2e 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4841,6 +4841,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
// If there is no resumed activity, it will choose the pausing or focused activity.
: mRootWindowContainer.getTopResumedActivity();
mTopApp = top != null ? top.app : null;
+ if (mTopApp == mPreviousProcess) mPreviousProcess = null;
}
/**