diff options
| author | Amos Bianchi <amosbianchi@google.com> | 2020-12-14 19:19:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 19:19:25 +0000 |
| commit | abfd17fce219c84e8bb7c97ba49f744b35d1b8e2 (patch) | |
| tree | 72b4ac8fd0c02004955e20e361736a594f7b2a1e /packages/SettingsProvider/res | |
| parent | 11c28aeb13ef29b2d7c28676442aded52421b613 (diff) | |
| parent | 335da989d5aec2a0ae5cd650724b862ad4eb9ed4 (diff) | |
Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b am: 335da989d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If90808b1776648bb40ed108fb02bf7bbeac68c7b
Diffstat (limited to 'packages/SettingsProvider/res')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 51f69a95e163..2eba38e1c4cd 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -180,7 +180,7 @@ <!-- Default state of tap to wake --> <bool name="def_double_tap_to_wake">true</bool> - <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT --> + <!-- Default for Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT --> <string name="def_nfc_payment_component"></string> <!-- Default setting for ability to add users from the lock screen --> |