commit 2545e922644c823ea870aa483a0780c3bb9ef67a
author Alex Chau <alexchau@google.com> Mon Jun 06 14:03:17 2022 +0100
committer Alex Chau <alexchau@google.com> Thu Jun 09 12:12:57 2022 +0000
tree 81b0104ac942a7c75393429a489538b72cbd8852
parent d4a79eb99b9e98f901e1b4e244d7bfcc2b9d1c09

Use DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED for getDisplays

Bug: 227459045
Bug: 221071695
Test: manual
Change-Id: I8c1587e05a30abf75a01a84ebda6522606abb99b

quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java

diff --git a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
index 19a48db..9bb3d56 100644
--- a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
+++ b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java
@@ -16,6 +16,7 @@
 package com.android.quickstep.util;
 
 import android.content.Context;
+import android.hardware.display.DisplayManager;
 import android.view.Display;
 
 import com.android.launcher3.util.window.WindowManagerProxy;
@@ -43,4 +44,10 @@
     public int getRotation(Context context) {
         return context.getResources().getConfiguration().windowConfiguration.getRotation();
     }
+
+    @Override
+    protected Display[] getDisplays(Context context) {
+        return context.getSystemService(DisplayManager.class).getDisplays(
+                DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED);
+    }
 }

src/com/android/launcher3/util/window/WindowManagerProxy.java

diff --git a/src/com/android/launcher3/util/window/WindowManagerProxy.java b/src/com/android/launcher3/util/window/WindowManagerProxy.java
index 92f718e..9665bf9 100644
--- a/src/com/android/launcher3/util/window/WindowManagerProxy.java
+++ b/src/com/android/launcher3/util/window/WindowManagerProxy.java
@@ -90,7 +90,7 @@
      */
     public ArrayMap<String, Pair<CachedDisplayInfo, WindowBounds[]>> estimateInternalDisplayBounds(
             Context context) {
-        Display[] displays = context.getSystemService(DisplayManager.class).getDisplays();
+        Display[] displays = getDisplays(context);
         ArrayMap<String, Pair<CachedDisplayInfo, WindowBounds[]>> result = new ArrayMap<>();
         for (Display display : displays) {
             if (isInternalDisplay(display)) {
@@ -355,4 +355,11 @@
         }
         return d.getRotation();
     }
+
+    /**
+     * Returns all currently valid logical displays.
+     */
+    protected Display[] getDisplays(Context context) {
+        return context.getSystemService(DisplayManager.class).getDisplays();
+    }
 }