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

Commit 3486cf4d authored by Dave Mankoff's avatar Dave Mankoff
Browse files

resolve merge conflicts of 0e680785 to qt-r1-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idf6ca46cd849b6d363fd5f1633877224141a7943
parents 1ec1ecb3 0e680785

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