am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev (e8e3125e) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerPolicy.java

+17 −13

Original line number	Original line	Diff line number	Diff line
	@@ -931,6 +931,11 @@ public interface WindowManagerPolicy {
	*/		*/
	public int focusChangedLw(WindowState lastFocus, WindowState newFocus);		public int focusChangedLw(WindowState lastFocus, WindowState newFocus);

			/**
			* Called when the device is waking up.
			*/
			public void wakingUp();

	/**		/**
	* Called when the device is going to sleep.		* Called when the device is going to sleep.
	*		*
	@@ -939,26 +944,25 @@ public interface WindowManagerPolicy {
	*/		*/
	public void goingToSleep(int why);		public void goingToSleep(int why);

	public interface ScreenOnListener {
	void onScreenOn();
	}

	/**		/**
	* Called when the device is waking up.		* Called when the device is about to turn on the screen to show content.
			* When waking up, this method will be called once after the call to wakingUp().
			* When dozing, the method will be called sometime after the call to goingToSleep() and
			* may be called repeatedly in the case where the screen is pulsing on and off.
			*
	* Must call back on the listener to tell it when the higher-level system		* Must call back on the listener to tell it when the higher-level system
	* is ready for the screen to go on (i.e. the lock screen is shown).		* is ready for the screen to go on (i.e. the lock screen is shown).
	*/		*/
	public void wakingUp(ScreenOnListener screenOnListener);		public void screenTurningOn(ScreenOnListener screenOnListener);

	/**		public interface ScreenOnListener {
	* Return whether the screen is about to turn on or is currently on.		void onScreenOn();
	*/		}
	public boolean isScreenOnEarly();

	/**		/**
	* Return whether the screen is fully turned on.		* Return whether the system is awake.
	*/		*/
	public boolean isScreenOnFully();		public boolean isAwake();

	/**		/**
	* Tell the policy that the lid switch has changed state.		* Tell the policy that the lid switch has changed state.

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+85 −57

Original line number	Original line	Diff line number	Diff line
	@@ -351,8 +351,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	boolean mLidControlsSleep;		boolean mLidControlsSleep;
	int mShortPressOnPowerBehavior = -1;		int mShortPressOnPowerBehavior = -1;
	int mLongPressOnPowerBehavior = -1;		int mLongPressOnPowerBehavior = -1;
	boolean mScreenOnEarly = false;		boolean mAwakeEarly = false;
	boolean mScreenOnFully = false;		boolean mAwakeFully = false;
	boolean mOrientationSensorEnabled = false;		boolean mOrientationSensorEnabled = false;
	int mCurrentAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;		int mCurrentAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
	boolean mHasSoftInput = false;		boolean mHasSoftInput = false;
	@@ -548,6 +548,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	private static final int MSG_DISPATCH_SHOW_GLOBAL_ACTIONS = 10;		private static final int MSG_DISPATCH_SHOW_GLOBAL_ACTIONS = 10;
	private static final int MSG_HIDE_BOOT_MESSAGE = 11;		private static final int MSG_HIDE_BOOT_MESSAGE = 11;
	private static final int MSG_LAUNCH_VOICE_ASSIST_WITH_WAKE_LOCK = 12;		private static final int MSG_LAUNCH_VOICE_ASSIST_WITH_WAKE_LOCK = 12;
			private static final int MSG_SCREEN_TURNING_ON = 13;

	private class PolicyHandler extends Handler {		private class PolicyHandler extends Handler {
	@Override		@Override
	@@ -573,22 +574,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	break;		break;
	case MSG_KEYGUARD_DRAWN_COMPLETE:		case MSG_KEYGUARD_DRAWN_COMPLETE:
	if (DEBUG_WAKEUP) Slog.w(TAG, "Setting mKeyguardDrawComplete");		if (DEBUG_WAKEUP) Slog.w(TAG, "Setting mKeyguardDrawComplete");
	mKeyguardDrawComplete = true;		finishKeyguardDrawn();
	finishScreenTurningOn();
	break;		break;
	case MSG_KEYGUARD_DRAWN_TIMEOUT:		case MSG_KEYGUARD_DRAWN_TIMEOUT:
	Slog.w(TAG, "Keyguard drawn timeout. Setting mKeyguardDrawComplete");		Slog.w(TAG, "Keyguard drawn timeout. Setting mKeyguardDrawComplete");
	mKeyguardDrawComplete = true;		finishKeyguardDrawn();
	finishScreenTurningOn();
	break;		break;
	case MSG_WINDOW_MANAGER_DRAWN_COMPLETE:		case MSG_WINDOW_MANAGER_DRAWN_COMPLETE:
	if (DEBUG_WAKEUP) Slog.w(TAG, "Setting mWindowManagerDrawComplete");		if (DEBUG_WAKEUP) Slog.w(TAG, "Setting mWindowManagerDrawComplete");
	mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);		finishWindowsDrawn();
	mWindowManagerDrawComplete = true;
	finishScreenTurningOn();
	break;		break;
	case MSG_WAKING_UP:		case MSG_WAKING_UP:
	handleWakingUp((ScreenOnListener) msg.obj);		handleWakingUp();
	break;		break;
	case MSG_HIDE_BOOT_MESSAGE:		case MSG_HIDE_BOOT_MESSAGE:
	handleHideBootMessage();		handleHideBootMessage();
	@@ -596,6 +593,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	case MSG_LAUNCH_VOICE_ASSIST_WITH_WAKE_LOCK:		case MSG_LAUNCH_VOICE_ASSIST_WITH_WAKE_LOCK:
	launchVoiceAssistWithWakeLock(msg.arg1 != 0);		launchVoiceAssistWithWakeLock(msg.arg1 != 0);
	break;		break;
			case MSG_SCREEN_TURNING_ON:
			handleScreenTurningOn((ScreenOnListener)msg.obj);
			break;
	}		}
	}		}
	}		}
	@@ -766,11 +766,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	//Could have been invoked due to screen turning on or off or		//Could have been invoked due to screen turning on or off or
	//change of the currently visible window's orientation		//change of the currently visible window's orientation
	if (localLOGV) Slog.v(TAG, "Screen status="+mScreenOnEarly+		if (localLOGV) Slog.v(TAG, "Screen status="+mAwakeEarly+
	", current orientation="+mCurrentAppOrientation+		", current orientation="+mCurrentAppOrientation+
	", SensorEnabled="+mOrientationSensorEnabled);		", SensorEnabled="+mOrientationSensorEnabled);
	boolean disable = true;		boolean disable = true;
	if (mScreenOnEarly) {		if (mAwakeEarly) {
	if (needSensorRunningLp()) {		if (needSensorRunningLp()) {
	disable = false;		disable = false;
	//enable listener if not already enabled		//enable listener if not already enabled
	@@ -1332,7 +1332,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}

	private boolean shouldEnableWakeGestureLp() {		private boolean shouldEnableWakeGestureLp() {
	return mWakeGestureEnabledSetting && !mScreenOnEarly		return mWakeGestureEnabledSetting && !mAwakeEarly
	&& (!mLidControlsSleep \|\| mLidState != LID_CLOSED)		&& (!mLidControlsSleep \|\| mLidState != LID_CLOSED)
	&& mWakeGestureListener.isSupported();		&& mWakeGestureListener.isSupported();
	}		}
	@@ -4731,9 +4731,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	@Override		@Override
	public void goingToSleep(int why) {		public void goingToSleep(int why) {
	EventLog.writeEvent(70000, 0);		EventLog.writeEvent(70000, 0);
			if (DEBUG_WAKEUP) Slog.i(TAG, "Going to sleep...");
	synchronized (mLock) {		synchronized (mLock) {
	mScreenOnEarly = false;		mAwakeEarly = false;
	mScreenOnFully = false;		mAwakeFully = false;
	}		}
	if (mKeyguardDelegate != null) {		if (mKeyguardDelegate != null) {
	mKeyguardDelegate.onScreenTurnedOff(why);		mKeyguardDelegate.onScreenTurnedOff(why);
	@@ -4746,72 +4747,103 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}

	@Override		@Override
	public void wakingUp(final ScreenOnListener screenOnListener) {		public void wakingUp() {
	EventLog.writeEvent(70000, 1);		EventLog.writeEvent(70000, 1);
	if (DEBUG_WAKEUP) Slog.i(TAG, "Screen turning on...",		if (DEBUG_WAKEUP) Slog.i(TAG, "Waking up...");
	new RuntimeException("here").fillInStackTrace());		mHandler.obtainMessage(MSG_WAKING_UP).sendToTarget();
	mHandler.obtainMessage(MSG_WAKING_UP, screenOnListener).sendToTarget();
	}		}

	// Called on the mHandler thread.		// Called on the mHandler thread.
	private void handleWakingUp(final ScreenOnListener screenOnListener) {		private void handleWakingUp() {
	if (screenOnListener != null) {
	mScreenOnListener = screenOnListener;
	}

	synchronized (mLock) {		synchronized (mLock) {
	mScreenOnEarly = true;		mAwakeEarly = true;
	updateWakeGestureListenerLp();		updateWakeGestureListenerLp();
	updateOrientationListenerLp();		updateOrientationListenerLp();
	updateLockScreenTimeout();		updateLockScreenTimeout();
	}		}

	mKeyguardDrawComplete = false;		mKeyguardDrawComplete = false;
	mWindowManagerDrawComplete = false;		mWindowManagerDrawComplete = false; // wait for later call to screenTurningOn
	if (mKeyguardDelegate != null) {		if (mKeyguardDelegate != null) {
	mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);		mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
	mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);		mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);
	mKeyguardDelegate.onScreenTurnedOn(mKeyguardDelegateCallback);		mKeyguardDelegate.onScreenTurnedOn(mKeyguardDelegateCallback);
			// ... eventually calls finishKeyguardDrawn
	} else {		} else {
	if (DEBUG_WAKEUP) Slog.d(TAG, "null mKeyguardDelegate: setting mKeyguardDrawComplete.");		if (DEBUG_WAKEUP) Slog.d(TAG, "null mKeyguardDelegate: setting mKeyguardDrawComplete.");
			finishKeyguardDrawn();
			}
			}

			// Called on the mHandler thread.
			private void finishKeyguardDrawn() {
			if (!mKeyguardDrawComplete) {
	mKeyguardDrawComplete = true;		mKeyguardDrawComplete = true;
			mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
			finishScreenTurningOn();
	}		}
			}

			@Override
			public void screenTurningOn(final ScreenOnListener screenOnListener) {
			EventLog.writeEvent(70000, 1);
			if (DEBUG_WAKEUP) Slog.i(TAG, "Screen turning on...");
			mHandler.obtainMessage(MSG_SCREEN_TURNING_ON, screenOnListener).sendToTarget();
			}

			// Called on the mHandler thread.
			private void handleScreenTurningOn(ScreenOnListener screenOnListener) {
			mScreenOnListener = screenOnListener;

			mWindowManagerDrawComplete = false;
	mWindowManagerInternal.waitForAllWindowsDrawn(mWindowManagerDrawCallback,		mWindowManagerInternal.waitForAllWindowsDrawn(mWindowManagerDrawCallback,
	WAITING_FOR_DRAWN_TIMEOUT);		WAITING_FOR_DRAWN_TIMEOUT);
			// ... eventually calls finishWindowsDrawn
			}

			// Called on the mHandler thread.
			private void finishWindowsDrawn() {
			if (!mWindowManagerDrawComplete) {
			mWindowManagerDrawComplete = true;
			finishScreenTurningOn();
			}
	}		}

	// Called on the mHandler thread.		// Called on the mHandler thread.
	private void finishScreenTurningOn() {		private void finishScreenTurningOn() {
	if (DEBUG_WAKEUP) Slog.d(TAG,		if (DEBUG_WAKEUP) Slog.d(TAG,
	"finishScreenTurningOn: mKeyguardDrawComplete=" + mKeyguardDrawComplete		"finishScreenTurningOn: mAwakeEarly=" + mAwakeEarly
			+ " mKeyguardDrawComplete=" + mKeyguardDrawComplete
	+ " mWindowManagerDrawComplete=" + mWindowManagerDrawComplete);		+ " mWindowManagerDrawComplete=" + mWindowManagerDrawComplete);
	if (!mKeyguardDrawComplete \|\| !mWindowManagerDrawComplete) {		boolean awake;
			synchronized (mLock) {
			if ((mAwakeEarly && !mKeyguardDrawComplete)
			\|\| !mWindowManagerDrawComplete) {
	return;		return;
	}		}

	ScreenOnListener screenOnListener;		if (mAwakeEarly) {
	synchronized (mLock) {		mAwakeFully = true;
	mScreenOnFully = true;
	screenOnListener = mScreenOnListener;
	mScreenOnListener = null;
	}		}
			awake = mAwakeFully;
	try {
	mWindowManager.setEventDispatching(true);
	} catch (RemoteException unhandled) {
	}		}

	if (screenOnListener != null) {		if (DEBUG_WAKEUP) Slog.i(TAG, "Finished screen turning on...");
	screenOnListener.onScreenOn();
			if (mScreenOnListener != null) {
			mScreenOnListener.onScreenOn();
			mScreenOnListener = null;
	}		}

	setKeyguardDrawn();		if (awake) {
			setKeyguardDrawnFirstTime();

	if (mBootMessageNeedsHiding) {		if (mBootMessageNeedsHiding) {
	handleHideBootMessage();		handleHideBootMessage();
	mBootMessageNeedsHiding = false;		mBootMessageNeedsHiding = false;
	}		}
	}		}
			}

	private void handleHideBootMessage() {		private void handleHideBootMessage() {
	if (mBootMsgDialog == null) {		if (mBootMsgDialog == null) {
	@@ -4829,13 +4861,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}

	@Override		@Override
	public boolean isScreenOnEarly() {		public boolean isAwake() {
	return mScreenOnEarly;		return mAwakeFully;
	}

	@Override
	public boolean isScreenOnFully() {
	return mScreenOnFully;
	}		}

	/** {@inheritDoc} */		/** {@inheritDoc} */
	@@ -4909,7 +4936,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	}		}

	private void setKeyguardDrawn() {		private void setKeyguardDrawnFirstTime() {
	synchronized (mLock) {		synchronized (mLock) {
	mKeyguardDrawn = true;		mKeyguardDrawn = true;
	}		}
	@@ -5222,7 +5249,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	synchronized (mLock) {		synchronized (mLock) {
	mSystemBooted = true;		mSystemBooted = true;
	}		}
	wakingUp(null);		wakingUp();
			screenTurningOn(null);
	}		}

	ProgressDialog mBootMsgDialog = null;		ProgressDialog mBootMsgDialog = null;
	@@ -5352,7 +5380,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

	private void updateLockScreenTimeout() {		private void updateLockScreenTimeout() {
	synchronized (mScreenLockTimeout) {		synchronized (mScreenLockTimeout) {
	boolean enable = (mAllowLockscreenWhenOn && mScreenOnEarly &&		boolean enable = (mAllowLockscreenWhenOn && mAwakeEarly &&
	mKeyguardDelegate != null && mKeyguardDelegate.isSecure());		mKeyguardDelegate != null && mKeyguardDelegate.isSecure());
	if (mLockScreenTimerActive != enable) {		if (mLockScreenTimerActive != enable) {
	if (enable) {		if (enable) {
	@@ -5890,8 +5918,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	pw.print("mShortPressOnPowerBehavior="); pw.print(mShortPressOnPowerBehavior);		pw.print("mShortPressOnPowerBehavior="); pw.print(mShortPressOnPowerBehavior);
	pw.print(" mLongPressOnPowerBehavior="); pw.println(mLongPressOnPowerBehavior);		pw.print(" mLongPressOnPowerBehavior="); pw.println(mLongPressOnPowerBehavior);
	pw.print(prefix); pw.print("mHasSoftInput="); pw.println(mHasSoftInput);		pw.print(prefix); pw.print("mHasSoftInput="); pw.println(mHasSoftInput);
	pw.print(prefix); pw.print("mScreenOnEarly="); pw.print(mScreenOnEarly);		pw.print(prefix); pw.print("mAwakeEarly="); pw.print(mAwakeEarly);
	pw.print(" mScreenOnFully="); pw.print(mScreenOnFully);		pw.print(" mAwakeFully="); pw.print(mAwakeFully);
	pw.print(" mOrientationSensorEnabled="); pw.println(mOrientationSensorEnabled);		pw.print(" mOrientationSensorEnabled="); pw.println(mOrientationSensorEnabled);
	pw.print(prefix); pw.print("mOverscanScreen=("); pw.print(mOverscanScreenLeft);		pw.print(prefix); pw.print("mOverscanScreen=("); pw.print(mOverscanScreenLeft);
	pw.print(","); pw.print(mOverscanScreenTop);		pw.print(","); pw.print(mOverscanScreenTop);

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -9958,7 +9958,6 @@ public final class ActivityManagerService extends ActivityManagerNative
	void goingToSleep() {		void goingToSleep() {
	synchronized(this) {		synchronized(this) {
	mWentToSleep = true;		mWentToSleep = true;
	updateEventDispatchingLocked();
	goToSleepIfNeededLocked();		goToSleepIfNeededLocked();
	}		}
	}		}
	@@ -10056,7 +10055,6 @@ public final class ActivityManagerService extends ActivityManagerNative
	void wakingUp() {		void wakingUp() {
	synchronized(this) {		synchronized(this) {
	mWentToSleep = false;		mWentToSleep = false;
	updateEventDispatchingLocked();
	comeOutOfSleepIfNeededLocked();		comeOutOfSleepIfNeededLocked();
	}		}
	}		}

services/core/java/com/android/server/power/Notifier.java

+24 −6

Original line number	Original line	Diff line number	Diff line
	@@ -256,16 +256,11 @@ final class Notifier {
	if (mActualPowerState != POWER_STATE_AWAKE) {		if (mActualPowerState != POWER_STATE_AWAKE) {
	mActualPowerState = POWER_STATE_AWAKE;		mActualPowerState = POWER_STATE_AWAKE;
	mPendingWakeUpBroadcast = true;		mPendingWakeUpBroadcast = true;
	if (mPendingScreenOnUnblocker == null) {
	mScreenOnBlocker.acquire();
	}
	final ScreenOnUnblocker unblocker = new ScreenOnUnblocker();
	mPendingScreenOnUnblocker = unblocker;
	mHandler.post(new Runnable() {		mHandler.post(new Runnable() {
	@Override		@Override
	public void run() {		public void run() {
	EventLog.writeEvent(EventLogTags.POWER_SCREEN_STATE, 1, 0, 0, 0);		EventLog.writeEvent(EventLogTags.POWER_SCREEN_STATE, 1, 0, 0, 0);
	mPolicy.wakingUp(unblocker);		mPolicy.wakingUp();
	mActivityManagerInternal.wakingUp();		mActivityManagerInternal.wakingUp();
	}		}
	});		});
	@@ -337,6 +332,21 @@ final class Notifier {
	}		}
	}		}

			/**
			* Notifies that screen is about to be turned on (any state other than off).
			*/
			public void onScreenTurningOn() {
			synchronized (mLock) {
			final ScreenOnUnblocker unblocker = blockScreenOnLocked();
			mHandler.post(new Runnable() {
			@Override
			public void run() {
			mPolicy.screenTurningOn(unblocker);
			}
			});
			}
			}

	/**		/**
	* Called when there has been user activity.		* Called when there has been user activity.
	*/		*/
	@@ -460,6 +470,14 @@ final class Notifier {
	}		}
	}		}

			private ScreenOnUnblocker blockScreenOnLocked() {
			if (mPendingScreenOnUnblocker == null) {
			mScreenOnBlocker.acquire();
			}
			mPendingScreenOnUnblocker = new ScreenOnUnblocker();
			return mPendingScreenOnUnblocker;
			}

	private final class ScreenOnUnblocker implements WindowManagerPolicy.ScreenOnListener {		private final class ScreenOnUnblocker implements WindowManagerPolicy.ScreenOnListener {
	@Override		@Override
	public void onScreenOn() {		public void onScreenOn() {

services/core/java/com/android/server/power/PowerManagerService.java

+18 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1767,6 +1767,7 @@ public final class PowerManagerService extends SystemService
	if ((dirty & (DIRTY_WAKE_LOCKS \| DIRTY_USER_ACTIVITY \| DIRTY_WAKEFULNESS		if ((dirty & (DIRTY_WAKE_LOCKS \| DIRTY_USER_ACTIVITY \| DIRTY_WAKEFULNESS
	\| DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED \| DIRTY_BOOT_COMPLETED		\| DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED \| DIRTY_BOOT_COMPLETED
	\| DIRTY_SETTINGS \| DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) {		\| DIRTY_SETTINGS \| DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) {
			boolean wasBlockerNeeded = isScreenOnBlockerNeededLocked(mDisplayPowerRequest);
	mDisplayPowerRequest.policy = getDesiredScreenPolicyLocked();		mDisplayPowerRequest.policy = getDesiredScreenPolicyLocked();

	int screenBrightness = mScreenBrightnessSettingDefault;		int screenBrightness = mScreenBrightnessSettingDefault;
	@@ -1803,8 +1804,6 @@ public final class PowerManagerService extends SystemService

	mDisplayPowerRequest.useProximitySensor = shouldUseProximitySensorLocked();		mDisplayPowerRequest.useProximitySensor = shouldUseProximitySensorLocked();

	mDisplayPowerRequest.blockScreenOn = mScreenOnBlocker.isHeld();

	mDisplayPowerRequest.lowPowerMode = mLowPowerModeEnabled;		mDisplayPowerRequest.lowPowerMode = mLowPowerModeEnabled;

	if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DOZE) {		if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DOZE) {
	@@ -1816,6 +1815,12 @@ public final class PowerManagerService extends SystemService
	mDisplayPowerRequest.dozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;		mDisplayPowerRequest.dozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;
	}		}

			if (!wasBlockerNeeded && isScreenOnBlockerNeededLocked(mDisplayPowerRequest)
			&& !mScreenOnBlocker.isHeld()) {
			mNotifier.onScreenTurningOn();
			}
			mDisplayPowerRequest.blockScreenOn = mScreenOnBlocker.isHeld();

	mDisplayReady = mDisplayManagerInternal.requestPowerState(mDisplayPowerRequest,		mDisplayReady = mDisplayManagerInternal.requestPowerState(mDisplayPowerRequest,
	mRequestWaitForNegativeProximity);		mRequestWaitForNegativeProximity);
	mRequestWaitForNegativeProximity = false;		mRequestWaitForNegativeProximity = false;
	@@ -1832,6 +1837,17 @@ public final class PowerManagerService extends SystemService
	return mDisplayReady && !oldDisplayReady;		return mDisplayReady && !oldDisplayReady;
	}		}

			private static boolean isScreenOnBlockerNeededLocked(DisplayPowerRequest req) {
			switch (req.policy) {
			case DisplayPowerRequest.POLICY_OFF:
			return false;
			case DisplayPowerRequest.POLICY_DOZE:
			return req.dozeScreenState != Display.STATE_OFF;
			default:
			return true;
			}
			}

	private static boolean isValidBrightness(int value) {		private static boolean isValidBrightness(int value) {
	return value >= 0 && value <= 255;		return value >= 0 && value <= 255;
	}		}