commit ab132eebafbd9260974bec72f3efbc69327885cc
author Andrii Kulian <akulian@google.com> Tue Jul 24 22:10:21 2018 +0800
committer Andrii Kulian <akulian@google.com> Mon Jul 30 08:10:00 2018 +0800
tree f0078d3ff1e88e439d853e3b4a39739994dffcdd
parent fab85f0fc33da068502c4debc2933f61fcd905fc

Per-display resumed activities

Allow each display to have its own resumed activity. The focus is
defined by Z-order of displays reported from WindowManager.

Bug: 111541062
Test: ActivityManagerMultiDisplayTests
Change-Id: I347dcfcd1e34f4db985b7d9a649b0a1e6b730eee

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

diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index bd621ed..67abedc 100644
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -1941,7 +1941,7 @@
             } else {
                 if (deferRelaunchUntilPaused) {
                     stack.destroyActivityLocked(this, true /* removeFromApp */, "stop-config");
-                    mStackSupervisor.resumeFocusedStackTopActivityLocked();
+                    mStackSupervisor.resumeFocusedStacksTopActivitiesLocked();
                 } else {
                     mStackSupervisor.updatePreviousProcessLocked(this);
                 }
@@ -2362,7 +2362,7 @@
             frozenBeforeDestroy = true;
             if (!service.updateDisplayOverrideConfigurationLocked(config, this,
                     false /* deferResume */, displayId)) {
-                mStackSupervisor.resumeFocusedStackTopActivityLocked();
+                mStackSupervisor.resumeFocusedStacksTopActivitiesLocked();
             }
         }
         service.getTaskChangeNotificationController().notifyActivityRequestedOrientationChanged(