commit 9ed29123a1f1b2f68d5bc6ccdafb636eefd49726
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 04 07:26:10 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 04 07:26:10 2018 +0000
tree 09aa0b718fd6006c7e1e61f8c8492d4f026e1f91
parent ca39fe33e257780c696f48928a49a78ef052c4df
parent ce47812ade9260ad484a0aa241273f9f6fe98f61

Snap for 4698807 from ce47812ade9260ad484a0aa241273f9f6fe98f61 to pi-release

Change-Id: I10f4c25d948f53a934fa43b54c180ea977bb05ce

src/adaptation/NfcAdaptation.cc

diff --git a/src/adaptation/NfcAdaptation.cc b/src/adaptation/NfcAdaptation.cc
index 9f0de1d..d288f0c 100644
--- a/src/adaptation/NfcAdaptation.cc
+++ b/src/adaptation/NfcAdaptation.cc
@@ -193,6 +193,8 @@
                         ConfigValue(config.defaultOffHostRouteFelica));
       configMap.emplace(NAME_DEFAULT_SYS_CODE_ROUTE,
                         ConfigValue(config.defaultSystemCodeRoute));
+      configMap.emplace(NAME_DEFAULT_SYS_CODE_PWR_STATE,
+                        ConfigValue(config.defaultSystemCodePowerState));
       configMap.emplace(NAME_OFF_HOST_SIM_PIPE_ID,
                         ConfigValue(config.offHostSIMPipeId));
       configMap.emplace(NAME_OFF_HOST_ESE_PIPE_ID,

src/include/nfc_config.h

diff --git a/src/include/nfc_config.h b/src/include/nfc_config.h
index 890602d..9229ec9 100644
--- a/src/include/nfc_config.h
+++ b/src/include/nfc_config.h
@@ -43,6 +43,7 @@
 #define NAME_DEFAULT_OFFHOST_ROUTE "DEFAULT_OFFHOST_ROUTE"
 #define NAME_DEFAULT_NFCF_ROUTE "DEFAULT_NFCF_ROUTE"
 #define NAME_DEFAULT_SYS_CODE_ROUTE "DEFAULT_SYS_CODE_ROUTE"
+#define NAME_DEFAULT_SYS_CODE_PWR_STATE "DEFAULT_SYS_CODE_PWR_STATE"
 #define NAME_DEFAULT_ROUTE "DEFAULT_ROUTE"
 #define NAME_OFF_HOST_ESE_PIPE_ID "OFF_HOST_ESE_PIPE_ID"
 #define NAME_OFF_HOST_SIM_PIPE_ID "OFF_HOST_SIM_PIPE_ID"