am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button... (799f0e50) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -1342,24 +1342,30 @@ class PowerManagerService extends IPowerManager.Stub
		public void setScreenBrightnessOverride(int brightness) {
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);

		if (mSpew) Slog.d(TAG, "setScreenBrightnessOverride " + brightness);
		synchronized (mLocks) {
		if (mScreenBrightnessOverride != brightness) {
		mScreenBrightnessOverride = brightness;
		if (isScreenOn()) {
		updateLightsLocked(mPowerState, SCREEN_ON_BIT);
		}
		}
		}
		}

		public void setButtonBrightnessOverride(int brightness) {
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);

		if (mSpew) Slog.d(TAG, "setButtonBrightnessOverride " + brightness);
		synchronized (mLocks) {
		if (mButtonBrightnessOverride != brightness) {
		mButtonBrightnessOverride = brightness;
		if (isScreenOn()) {
		updateLightsLocked(mPowerState, BUTTON_BRIGHT_BIT \| KEYBOARD_BRIGHT_BIT);
		}
		}
		}
		}

		/**
		* Sanity-check that gets called 5 seconds after any call to