services: button brightness should check proximity (cd09f259) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -1638,11 +1638,15 @@ public final class PowerManagerService extends SystemService
		if (mButtonTimeout != 0 && now > mLastUserActivityTime + mButtonTimeout) {
		mButtonsLight.setBrightness(0);
		} else {
		// The proximity sensor during a call may indicate positive,
		// the screen & buttons should stay off until it indicates negative
		if (!mProximityPositive) {
		mButtonsLight.setBrightness(buttonBrightness);
		if (buttonBrightness != 0 && mButtonTimeout != 0) {
		nextTimeout = now + mButtonTimeout;
		}
		}
		}
		mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;
		} else {
		nextTimeout = mLastUserActivityTime + screenOffTimeout;