Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daf616ad authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Gerrit Code Review
Browse files

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

parents 8d02a3ba 04762e2c

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

+4 −2
Original line number Diff line number Diff line
@@ -4337,10 +4337,12 @@ public final class DisplayManagerService extends SystemService { 
                    if ((flags & DisplayDeviceInfo.FLAG_NEVER_BLANK) == 0) {

                        final DisplayPowerControllerInterface displayPowerController =

                                mDisplayPowerControllers.get(id);

                        if (displayPowerController != null) {

                            ready &= displayPowerController.requestPowerState(request,

                                    waitForNegativeProximity);

                        }

                    }

                }



                return ready;

            }