Merge "Enable secure NFC support" into main

This commit is contained in:
Treehugger Robot 2024-04-18 04:27:03 +00:00 committed by Android (Google) Code Review
commit ae1e5b2145
2 changed files with 2 additions and 10 deletions

View file

@ -16,11 +16,7 @@
<resources>
<bool name="nfcc_always_on_allowed">false</bool>
<bool name="polling_disable_allowed">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GR83Y</item>
<item>GEC77</item>
<item>GWVK6</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<bool name="nfc_observe_mode_supported">true</bool>
<bool name="enable_secure_nfc_support">true</bool>
</resources>

View file

@ -16,10 +16,6 @@
<resources>
<bool name="nfcc_always_on_allowed">false</bool>
<bool name="polling_disable_allowed">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GR83Y</item>
<item>GEC77</item>
<item>GWVK6</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<bool name="enable_secure_nfc_support">true</bool>
</resources>