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

Commit 00cbc1e2 authored by Dave Mankoff's avatar Dave Mankoff Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of 0e680785 to... 

Merge "resolve merge conflicts of 0e680785 to qt-r1-dev" into qt-r1-dev
am: 2a5ac75f

Change-Id: Ie2c4e0929f4b23730a5cce58a160cf3a8e40adc1
parents 08108082 2a5ac75f

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java

+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();