commit 95c96de2e04386dd41ac816459c80adec9549657
author Sean Stout <sstout@google.com> Sun Nov 22 22:16:54 2020 -0800
committer Sean Stout <sstout@google.com> Thu Feb 04 12:48:10 2021 +0000
tree 76c9331668077085d8377ae60102f4eb0a24b24a
parent 9e2a817443841d296c3c9874ff925ee539bf1a4a

Only request power state of default display

Only the default display can have its power state controlled at this
time. Avoid requesting power state of any other display to avoid
initializing DisplayPowerController which does not shut itself down
properly in the event that a display is removed.

Bug: 178153032
Test: atest android.server.wm.DisplayCutoutTests#testDisplayCutout_never
Change-Id: Iea75815802d2759cba4f93d020c6c3700fee82a6

services/core/java/com/android/server/display/DisplayManagerService.java

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index e0baee7..97753c8 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -2761,22 +2761,8 @@
         public boolean requestPowerState(int groupId, DisplayPowerRequest request,
                 boolean waitForNegativeProximity) {
             synchronized (mSyncRoot) {
-                final DisplayGroup displayGroup = mLogicalDisplayMapper.getDisplayGroupLocked(
-                        groupId);
-                if (displayGroup == null) {
-                    return true;
-                }
-
-                final int size = displayGroup.getSizeLocked();
-                boolean ready = true;
-                for (int i = 0; i < size; i++) {
-                    final DisplayPowerController displayPowerController =
-                            mDisplayPowerControllers.get(displayGroup.getIdLocked(i));
-                    ready &= displayPowerController.requestPowerState(request,
-                            waitForNegativeProximity);
-                }
-
-                return ready;
+                return mDisplayPowerControllers.get(Display.DEFAULT_DISPLAY)
+                        .requestPowerState(request, waitForNegativeProximity);
             }
         }