Merge "Only request power state of default display" into sc-dev (514ec50c) · Commits · e / os / android_frameworks_base

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

+2 −16

Original line number	Original line	Diff line number	Diff line
	@@ -2761,22 +2761,8 @@ public final class DisplayManagerService extends SystemService {
	public boolean requestPowerState(int groupId, DisplayPowerRequest request,		public boolean requestPowerState(int groupId, DisplayPowerRequest request,
	boolean waitForNegativeProximity) {		boolean waitForNegativeProximity) {
	synchronized (mSyncRoot) {		synchronized (mSyncRoot) {
	final DisplayGroup displayGroup = mLogicalDisplayMapper.getDisplayGroupLocked(		return mDisplayPowerControllers.get(Display.DEFAULT_DISPLAY)
	groupId);		.requestPowerState(request, waitForNegativeProximity);
	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;
	}		}
	}		}