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

Commit 3b87854a authored by Dave Mankoff's avatar Dave Mankoff
Browse files

resolve merge conflicts of 8d7481f0 to qt-r1-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie3a1b2fbdf159c8cc6f50f0426930eedae458a09
parents a50e7bb2 8d7481f0

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ public class FalsingManagerProxy implements FalsingManager { 
    @VisibleForTesting

    @VisibleForTesting

    public void setupFalsingManager(Context context) {

    public void setupFalsingManager(Context context) {

        boolean brightlineEnabled = DeviceConfig.getBoolean(

        boolean brightlineEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, false);

                DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);





        if (mInternalFalsingManager != null) {

        if (mInternalFalsingManager != null) {

            mInternalFalsingManager.cleanup();

            mInternalFalsingManager.cleanup();