Merge "Fix adb shell command for screen_brightness" into rvc-dev am: 9024ce52c6 am: f2f06ff8e8

Change-Id: I0a7d7739249f878392f376763098a71f0089f314
This commit is contained in:
TreeHugger Robot
2020-04-15 17:51:39 +00:00
committed by Automerger Merge Worker

View File

@@ -390,6 +390,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
private ObjectAnimator mColorFadeOffAnimator; private ObjectAnimator mColorFadeOffAnimator;
private RampAnimator<DisplayPowerState> mScreenBrightnessRampAnimator; private RampAnimator<DisplayPowerState> mScreenBrightnessRampAnimator;
// The brightness synchronizer to allow changes in the int brightness value to be reflected in
// the float brightness value and vice versa.
@Nullable
private final BrightnessSynchronizer mBrightnessSynchronizer;
/** /**
* Creates the display power controller. * Creates the display power controller.
@@ -406,6 +410,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mWindowManagerPolicy = LocalServices.getService(WindowManagerPolicy.class); mWindowManagerPolicy = LocalServices.getService(WindowManagerPolicy.class);
mBlanker = blanker; mBlanker = blanker;
mContext = context; mContext = context;
mBrightnessSynchronizer = new BrightnessSynchronizer(context);
mDisplayDevice = displayDevice; mDisplayDevice = displayDevice;
PowerManager pm = context.getSystemService(PowerManager.class); PowerManager pm = context.getSystemService(PowerManager.class);