Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev am: a424c79c49

am: d1f126193d

Change-Id: I80130d84fd4db1b3e9814f95eb1eb992704e9407
This commit is contained in:
Michael Wright
2018-05-22 10:50:37 -07:00
committed by android-build-merger

View File

@@ -489,6 +489,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mTemporaryScreenBrightness = -1;
mPendingScreenBrightnessSetting = -1;
mTemporaryAutoBrightnessAdjustment = Float.NaN;
mPendingAutoBrightnessAdjustment = Float.NaN;
}
/**
@@ -1499,6 +1500,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
return false;
}
if (mAutoBrightnessAdjustment == mPendingAutoBrightnessAdjustment) {
mPendingAutoBrightnessAdjustment = Float.NaN;
return false;
}
mAutoBrightnessAdjustment = mPendingAutoBrightnessAdjustment;