Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cf3b925 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev

parents 6da92032 5d03a536

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

+3 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ public final class PowerManagerService extends IPowerManager.Stub 
        mScreenAutoBrightnessAdjustmentSetting = Settings.System.getFloat(resolver,

                Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0.0f);

        if (oldScreenAutoBrightnessAdjustmentSetting != mScreenAutoBrightnessAdjustmentSetting) {

            mTemporaryScreenAutoBrightnessAdjustmentSettingOverride = -1;

            mTemporaryScreenAutoBrightnessAdjustmentSettingOverride = Float.NaN;

        }



        mScreenBrightnessModeSetting = Settings.System.getInt(resolver,
@@ -1347,7 +1347,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
    }



    private static boolean isValidAutoBrightnessAdjustment(float value) {

        return !Float.isNaN(value);

        // Handles NaN by always returning false.

        return value >= -1.0f && value <= 1.0f;

    }



    private int getDesiredScreenPowerState() {