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

Commit 3bb4b466 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

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

Merge "Fix NPE in requestPowerState when displayPowerController is null" into main am: daf616ad am: 47474439 am: 5a9f2600

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2864446



Change-Id: I253f5569469fd8b364059697fbf7a10eea5e3830
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc31b078 5a9f2600

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

+4 −2
Original line number Diff line number Diff line
@@ -4573,10 +4573,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;

            }