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

Commit bc1d7860 authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am:... 

Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc420322 am: 388980d8 am: c1db6c05
am: bbc00c87

Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc
parents 92b504cb bbc00c87

core/java/android/provider/Settings.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -6802,7 +6802,8 @@ public final class Settings { 
            QS_TILES,

            QS_TILES,

            DOZE_ENABLED,

            DOZE_ENABLED,

            DOZE_PULSE_ON_PICK_UP,

            DOZE_PULSE_ON_PICK_UP,

            DOZE_PULSE_ON_DOUBLE_TAP

            DOZE_PULSE_ON_DOUBLE_TAP,

            NFC_PAYMENT_DEFAULT_COMPONENT

        };

        };





        /**

        /**