Merge "Use -1.0f in SurfaceControl to turn off brightness" (5ffc2944) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/lights/LightsService.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -84,8 +84,12 @@ public class LightsService extends SystemService {
	if (DEBUG) {		if (DEBUG) {
	Slog.d(TAG, "Using new setBrightness path!");		Slog.d(TAG, "Using new setBrightness path!");
	}		}
			if (brightness == 0) {
			SurfaceControl.setDisplayBrightness(mDisplayToken, -1.0f);
			} else {
	SurfaceControl.setDisplayBrightness(mDisplayToken,		SurfaceControl.setDisplayBrightness(mDisplayToken,
	(float) brightness / mSurfaceControlMaximumBrightness);		(float) (brightness - 1) / (mSurfaceControlMaximumBrightness - 1));
			}
	} else {		} else {
	int color = brightness & 0x000000ff;		int color = brightness & 0x000000ff;
	color = 0xff000000 \| (color << 16) \| (color << 8) \| color;		color = 0xff000000 \| (color << 16) \| (color << 8) \| color;