commit 3026e8d7a52c6def2a99e3d73dbdda330c2966fc
author Riddle Hsu <riddlehsu@google.com> Fri Aug 03 15:50:53 2018 +0800
committer Riddle Hsu <riddlehsu@google.com> Fri Aug 03 21:35:19 2018 +0800
tree 79d247321c1e259fff0d1461e1ba16d75fe17ba8
parent 19391e88789cfc349f4c650d352497bd0bfb3ced

Update focused app when adjusting focus to next stack

Now each displays have their own resumed activities. When a stack
of secondary display is removed and adjust focus to the primary
display, there is no activity state change to update focused app
because the top activity of primary display is already resumed.

Bug: 112119739
Test: atest ActivityManagerMultiDisplayTests#testStackFocusSwitchOnStackEmptied
Change-Id: Id337939149db684cf67ac87bb096c73618e37d72

services/core/java/com/android/server/am/ActivityStack.java

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 54f87ce..fbf2855 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -498,7 +498,7 @@
                     + reason);
             setResumedActivity(record, reason + " - onActivityStateChanged");
             if (record == mStackSupervisor.getTopResumedActivity()) {
-                // TODO(b/111541062): Support tracking multiple resumed activities
+                // TODO(b/111361570): Support multiple focused apps in WM
                 mService.setResumedActivityUncheckLocked(record, reason);
             }
             mStackSupervisor.mRecentTasks.add(record.getTask());
@@ -3423,7 +3423,15 @@
         }
 
         // Move focus to next focusable stack if possible.
-        if (adjustFocusToNextFocusableStack(myReason) != null) {
+        final ActivityStack nextFocusableStack = adjustFocusToNextFocusableStack(myReason);
+        if (nextFocusableStack != null) {
+            final ActivityRecord top = nextFocusableStack.topRunningActivityLocked();
+            if (top != null && top == mStackSupervisor.getTopResumedActivity()) {
+                // TODO(b/111361570): Remove this and update focused app per-display in
+                // WindowManager every time an activity becomes resumed in
+                // ActivityTaskManagerService#setResumedActivityUncheckLocked().
+                mService.setResumedActivityUncheckLocked(top, reason);
+            }
             return;
         }
 

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index d1585cf..ffb15c9 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3451,7 +3451,7 @@
         stack.moveToFront(reason, task);
         // Report top activity change to tracking services and WM
         if (r == getTopResumedActivity()) {
-            // TODO(b/111541062): Support tracking multiple resumed activities
+            // TODO(b/111361570): Support multiple focused apps in WM
             mService.setResumedActivityUncheckLocked(r, reason);
         }
         return true;

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

diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
index 748b2d2..6ef08e5 100644
--- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
@@ -4732,7 +4732,7 @@
         updateResumedAppTrace(r);
         mLastResumedActivity = r;
 
-        // TODO(b/111541062): Support multiple focused apps in WM
+        // TODO(b/111361570): Support multiple focused apps in WM
         mWindowManager.setFocusedApp(r.appToken, true);
 
         applyUpdateLockStateLocked(r);