commit a9b20116ec7d563152d8f974eb4b8bd0d77ecb87
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 11 07:25:02 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 11 07:25:02 2018 +0000
tree f28d36660365aec05004fc30f107f183d08ad9a3
parent 910165eea1f2bcc4461f9bf6dfeb4a5b21e169fa
parent b69e205422fe729da11791b9d982744f259df080

Snap for 4713750 from b69e205422fe729da11791b9d982744f259df080 to pi-release

Change-Id: I77943c97afbe2a2b081ad8283872906d3aea9269

src/adaptation/NfcAdaptation.cc

diff --git a/src/adaptation/NfcAdaptation.cc b/src/adaptation/NfcAdaptation.cc
old mode 100644
new mode 100755
index d288f0c..528bdd7
--- a/src/adaptation/NfcAdaptation.cc
+++ b/src/adaptation/NfcAdaptation.cc
@@ -189,6 +189,7 @@
                         ConfigValue(config.nfaPollBailOutMode ? 1 : 0));
       configMap.emplace(NAME_DEFAULT_OFFHOST_ROUTE,
                         ConfigValue(config.defaultOffHostRoute));
+      configMap.emplace(NAME_DEFAULT_ROUTE, ConfigValue(config.defaultRoute));
       configMap.emplace(NAME_DEFAULT_NFCF_ROUTE,
                         ConfigValue(config.defaultOffHostRouteFelica));
       configMap.emplace(NAME_DEFAULT_SYS_CODE_ROUTE,
@@ -201,6 +202,10 @@
                         ConfigValue(config.offHostESEPipeId));
       configMap.emplace(NAME_ISO_DEP_MAX_TRANSCEIVE,
                         ConfigValue(config.maxIsoDepTransceiveLength));
+      if (config.hostWhitelist.size() != 0) {
+        configMap.emplace(NAME_DEVICE_HOST_WHITE_LIST,
+                          ConfigValue(config.hostWhitelist));
+      }
       /* For Backwards compatibility */
       if (config.presenceCheckAlgorithm ==
           PresenceCheckAlgorithm::ISO_DEP_NAK) {