Merge change I6ccd2ebc into eclair (3cba7288) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -105888,6 +105888,17 @@
		<parameter name="time" type="long">
		</parameter>
		</method>
		<method name="isScreenOn"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="newWakeLock"
		return="android.os.PowerManager.WakeLock"
		abstract="false"

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ interface IPowerManager
		long getScreenOnTime();
		void preventScreenOn(boolean prevent);
		void setScreenBrightnessOverride(int brightness);
		boolean isScreenOn();

		// sets the brightness of the backlights (screen, keyboard, button) 0-255
		void setBacklightBrightness(int brightness);

+20 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,26 @@ public class PowerManager
		}
		}

		/**
		* Returns whether the screen is currently on. The screen could be bright
		* or dim.
		*
		* {@samplecode
		* PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
		* boolean isScreenOn = pm.isScreenOn();
		* }
		*
		* @return whether the screen is on (bright or dim).
		*/
		public boolean isScreenOn()
		{
		try {
		return mService.isScreenOn();
		} catch (RemoteException e) {
		return false;
		}
		}

		private PowerManager()
		{
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -1780,13 +1780,13 @@ class PowerManagerService extends IPowerManager.Stub
		}
		}

		boolean screenIsOn() {
		public boolean isScreenOn() {
		synchronized (mLocks) {
		return (mPowerState & SCREEN_ON_BIT) != 0;
		}
		}

		boolean screenIsBright() {
		boolean isScreenBright() {
		synchronized (mLocks) {
		return (mPowerState & SCREEN_BRIGHT) == SCREEN_BRIGHT;
		}
		@@ -2089,7 +2089,7 @@ class PowerManagerService extends IPowerManager.Stub
		boolean enabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
		if (mUseSoftwareAutoBrightness && mAutoBrightessEnabled != enabled) {
		mAutoBrightessEnabled = enabled;
		if (screenIsOn()) {
		if (isScreenOn()) {
		// force recompute of backlight values
		if (mLightSensorValue >= 0) {
		int value = (int)mLightSensorValue;

+6 −6

Original line number	Diff line number	Diff line
		@@ -6095,8 +6095,8 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		// XXX end hack

		boolean screenIsOff = !mPowerManager.screenIsOn();
		boolean screenIsDim = !mPowerManager.screenIsBright();
		boolean screenIsOff = !mPowerManager.isScreenOn();
		boolean screenIsDim = !mPowerManager.isScreenBright();
		int actions = mPolicy.interceptKeyTq(event, !screenIsOff);

		if ((actions & WindowManagerPolicy.ACTION_GO_TO_SLEEP) != 0) {
		@@ -6126,8 +6126,8 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		case RawInputEvent.EV_REL: {
		boolean screenIsOff = !mPowerManager.screenIsOn();
		boolean screenIsDim = !mPowerManager.screenIsBright();
		boolean screenIsOff = !mPowerManager.isScreenOn();
		boolean screenIsDim = !mPowerManager.isScreenBright();
		if (screenIsOff) {
		if (!mPolicy.isWakeRelMovementTq(event.deviceId,
		device.classes, event)) {
		@@ -6143,8 +6143,8 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		case RawInputEvent.EV_ABS: {
		boolean screenIsOff = !mPowerManager.screenIsOn();
		boolean screenIsDim = !mPowerManager.screenIsBright();
		boolean screenIsOff = !mPowerManager.isScreenOn();
		boolean screenIsDim = !mPowerManager.isScreenBright();
		if (screenIsOff) {
		if (!mPolicy.isWakeAbsMovementTq(event.deviceId,
		device.classes, event)) {