Merge "Fixed screen brightness override in manual mode." into pi-dev

            brightness = mScreenBrightnessForVr;

        }

        boolean setBrightnessToOverride = false;

        if (brightness < 0 && mPowerRequest.screenBrightnessOverride > 0) {

            brightness = mPowerRequest.screenBrightnessOverride;

            // If there's a screen brightness override, we want to reset the brightness to it

            // whenever the user changes it, to communicate that these changes aren't taking

            // effect. However, for a nicer user experience, we don't do it here, but rather after

            // the temporary brightness has been taken into account.

            setBrightnessToOverride = true;

        }

        final boolean autoBrightnessEnabledInDoze =

            brightnessIsTemporary = true;

        }

        // Reset the brightness to the screen brightness override to communicate to the user that

        // her changes aren't taking effect.

        if (setBrightnessToOverride && !brightnessIsTemporary) {

            putScreenBrightnessSetting(brightness);

        }

        final boolean autoBrightnessAdjustmentChanged = updateAutoBrightnessAdjustment();

        if (autoBrightnessAdjustmentChanged) {

            mTemporaryAutoBrightnessAdjustment = Float.NaN;