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

Commit a1c136d7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 8d7481f0 to...

Merge "resolve merge conflicts of 8d7481f0 to qt-r1-dev-plus-aosp" into qt-r1-dev-plus-aosp
parents aae92427 3b87854a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class FalsingManagerProxy implements FalsingManager {
    @VisibleForTesting
    public void setupFalsingManager(Context context) {
        boolean brightlineEnabled = DeviceConfig.getBoolean(
                DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, false);
                DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);

        if (mInternalFalsingManager != null) {
            mInternalFalsingManager.cleanup();