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

am: c1db6c05d0 Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
2017-01-06 19:10:22 +00:00
parent 66602c8885 c1db6c05d0
commit bbc00c877f
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -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
        };

        /**