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

am: cc4203221b Change-Id: I4add3ce1cf3170aff887865302964b4425094692
2017-01-06 18:58:17 +00:00
parent ef5d1cb3b4 cc4203221b
commit 388980d88f
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
        };

        /**