commit daf616ad5a4a03072f737d8d24e50c059fb36fd3
author Piotr Wilczyński <wilczynskip@google.com> Wed Dec 20 14:32:56 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 20 14:32:56 2023 +0000
tree 669a6fc958b7f73f313f7a146b5ef1b2630d699e
parent 8d02a3bae909b53637e5989233c2bfba156c235a
parent 04762e2c59000b0237349fd874e1f0905dd29b96

Merge "Fix NPE in requestPowerState when displayPowerController is null" into main

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 bc7e156..dde5120 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -4337,8 +4337,10 @@
                     if ((flags & DisplayDeviceInfo.FLAG_NEVER_BLANK) == 0) {
                         final DisplayPowerControllerInterface displayPowerController =
                                 mDisplayPowerControllers.get(id);
-                        ready &= displayPowerController.requestPowerState(request,
-                                waitForNegativeProximity);
+                        if (displayPowerController != null) {
+                            ready &= displayPowerController.requestPowerState(request,
+                                    waitForNegativeProximity);
+                        }
                     }
                 }