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

Commit cd00fa7b authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14740070

Change-Id: I0b97bd402365a216c757acf5d285f61205ef6b4a
parents d45b31c8 c00c8754
Loading
Loading
Loading
Loading
+9 −1
Original line number Original line Diff line number Diff line
@@ -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