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

am: 388980d88f Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
2017-01-06 19:03:07 +00:00
parent e51a76861c 388980d88f
commit c1db6c05d0
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
        };

        /**