summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Chang <georgekgchang@google.com>2022-05-05 09:50:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-05 09:50:57 +0000
commit9dd7bcc7e925d975af5f3e7823c6fdb5587d9653 (patch)
tree45eb0e0fd89103ef6b9d739f7f394c8f21dd1d61
parentd6913254d5e084984b2d919db0f79809182577e8 (diff)
parentf8513383969bce6b17d41116292120971ba5c851 (diff)
downloadbarbet-temp_sam_236045730.tar.gz
Merge "Switch NFC from HIDL to AIDL" am: f851338396temp_sam_236045730
Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2087164 Change-Id: I7f46780be67edf1a38035fe3c9eed9dc886b504b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--nfc/libnfc-hal-st-G4S1M.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/nfc/libnfc-hal-st-G4S1M.conf b/nfc/libnfc-hal-st-G4S1M.conf
index ba0970d..ce4439f 100644
--- a/nfc/libnfc-hal-st-G4S1M.conf
+++ b/nfc/libnfc-hal-st-G4S1M.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P