commit b69e205422fe729da11791b9d982744f259df080
author Love Khanna <love.khanna@nxp.com> Fri Apr 06 22:41:39 2018 +0530
committer Ruchi Kandoi <kandoiruchi@google.com> Tue Apr 10 12:39:06 2018 -0700
tree f28d36660365aec05004fc30f107f183d08ad9a3
parent 4c168afb90216fb90974b4d3800d295da0f00de4

Add Vendor Configuration for HOST_WHITE_LIST and DEFAULT_ROUTE

Bug: 69876039
Test: Compiles, NFC enable/disable, Perform Card Emulation.
Change-Id: I412dc8896b78e803c70736b3b858b97ed80edc6e
(cherry picked from commit 56dc664f674c9274c24bcfe53adde3844aca0591)

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) {