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

Commit d7efee37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only request power state of default display" into sc-dev am: 514ec50c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I317650eeff19d852242569f153b5873c86296b4c
parents 27f97740 514ec50c

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

+2 −16
Original line number Diff line number Diff line
@@ -2761,22 +2761,8 @@ public final class DisplayManagerService extends SystemService { 
        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);

            }

        }