Merge "Remove DozeUi from the TunerService so we don't leak memory." into sc-dev

This commit is contained in:
Josh Tsuji
2021-06-08 17:31:01 +00:00
committed by Android (Google) Code Review

View File

@@ -62,6 +62,7 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable {
private final DozeParameters mDozeParameters; private final DozeParameters mDozeParameters;
private final DozeLog mDozeLog; private final DozeLog mDozeLog;
private final Lazy<StatusBarStateController> mStatusBarStateController; private final Lazy<StatusBarStateController> mStatusBarStateController;
private final TunerService mTunerService;
private boolean mKeyguardShowing; private boolean mKeyguardShowing;
private final KeyguardUpdateMonitorCallback mKeyguardVisibilityCallback = private final KeyguardUpdateMonitorCallback mKeyguardVisibilityCallback =
@@ -102,8 +103,15 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable {
mTimeTicker = new AlarmTimeout(alarmManager, this::onTimeTick, "doze_time_tick", handler); mTimeTicker = new AlarmTimeout(alarmManager, this::onTimeTick, "doze_time_tick", handler);
keyguardUpdateMonitor.registerCallback(mKeyguardVisibilityCallback); keyguardUpdateMonitor.registerCallback(mKeyguardVisibilityCallback);
mDozeLog = dozeLog; mDozeLog = dozeLog;
tunerService.addTunable(this, Settings.Secure.DOZE_ALWAYS_ON); mTunerService = tunerService;
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
mTunerService.addTunable(this, Settings.Secure.DOZE_ALWAYS_ON);
}
@Override
public void destroy() {
mTunerService.removeTunable(this);
} }
@Override @Override