diff options
| author | 2018-09-19 19:02:20 -0700 | |
|---|---|---|
| committer | 2018-09-20 16:50:03 +0000 | |
| commit | c543addf1fdfa4568d7c7d71dfb739fc80d50053 (patch) | |
| tree | 44cedfaa60eb94ecc9d64b09839f76bcdedd4624 | |
| parent | d5180a5ec2ca69d48c468be8b2bb35ded12c50f2 (diff) | |
Make sure to add default display before others
Some parts of WM init assume that display with id 0 will be added
before all other displays. This CL traverses the displays from DM
from the beginning of the list, which will provide increasing
display ids.
Bug: 74446287
Test: Boot bat_land with 2 displays attached
Change-Id: Ie46954cc9f20a29f30c5f45fb6aabf46eba63fa8
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 310898ef9ea3..d0b43d9c06f7 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -690,7 +690,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); final Display[] displays = mDisplayManager.getDisplays(); - for (int displayNdx = displays.length - 1; displayNdx >= 0; --displayNdx) { + for (int displayNdx = 0; displayNdx < displays.length; ++displayNdx) { final Display display = displays[displayNdx]; final ActivityDisplay activityDisplay = new ActivityDisplay(this, display); if (activityDisplay.mDisplayId == DEFAULT_DISPLAY) { |