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

Commit bbc00c87 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

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
parents 66602c88 c1db6c05

core/java/android/provider/Settings.java

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

            DOZE_ENABLED,

            DOZE_PULSE_ON_PICK_UP,

            DOZE_PULSE_ON_DOUBLE_TAP

            DOZE_PULSE_ON_DOUBLE_TAP,

            NFC_PAYMENT_DEFAULT_COMPONENT

        };



        /**