Fix someones merge fail (korg->github) that completely broke automatic backlight (58130bfb) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1813,7 +1813,7 @@ class PowerManagerService extends IPowerManager.Stub
	setLightBrightness(offMask, Power.BRIGHTNESS_OFF);		setLightBrightness(offMask, Power.BRIGHTNESS_OFF);
	}		}
	if (dimMask != 0) {		if (dimMask != 0) {
	int brightness = Power.BRIGHTNESS_DIM;		int brightness = mScreenDim;
	if ((newState & BATTERY_LOW_BIT) != 0 &&		if ((newState & BATTERY_LOW_BIT) != 0 &&
	brightness > Power.BRIGHTNESS_LOW_BATTERY) {		brightness > Power.BRIGHTNESS_LOW_BATTERY) {
	brightness = Power.BRIGHTNESS_LOW_BATTERY;		brightness = Power.BRIGHTNESS_LOW_BATTERY;
	@@ -2130,6 +2130,7 @@ class PowerManagerService extends IPowerManager.Stub
	setPowerState(mUserState \| mWakeLockState, noChangeLights,		setPowerState(mUserState \| mWakeLockState, noChangeLights,
	WindowManagerPolicy.OFF_BECAUSE_OF_USER);		WindowManagerPolicy.OFF_BECAUSE_OF_USER);
	setTimeoutLocked(time, timeoutOverride, SCREEN_BRIGHT);		setTimeoutLocked(time, timeoutOverride, SCREEN_BRIGHT);
			mAlwaysOnAndDimmed = false;
	}		}
	}		}
	}		}