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

Commit 47474439 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 main am: daf616ad 

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



Change-Id: Ic7e6096bc8c7af0a0865e4c8bc0ead63c5a8c1ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07c82439 daf616ad

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;

            }