Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0

am: bbc00c877f Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc
2017-01-06 19:19:51 +00:00
parent 92b504cb9e bbc00c877f
commit bc1d78606c
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6802,7 +6802,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
        };

        /**