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

Commit c58f7a90 authored by Dave Mankoff's avatar Dave Mankoff Committed by android-build-merger
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
am: a1c136d7

Change-Id: I400fcc8f89df9e16ece6cdf19112dac335dc004d
parents 0295832b a1c136d7
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();