commit de56882fdb7da54ff3702182f42aa4a0b1f5faa8
author Jizhou Liao <jizhou.liao@nxp.com> Fri May 18 11:42:06 2018 -0700
committer Ruchi Kandoi <kandoiruchi@google.com> Thu May 31 22:43:37 2018 +0000
tree 7b1e82c7a381a78814d77ae79c35dbcac253a1df
parent 972df2734d4481f91509310ccb6bf57cd07547a7

Allow multiple technology routes in a NFCEE

Bug: 79985987
Bug: 78568653
Test: VTS, Test routing command
Change-Id: Iceb4d5f924f7b85bfe5a59c2cf083961649d64d7
(cherry picked from commit 128f66179b67f32f204ffdf42c0be77e7e9cf71b)

src/nfa/ee/nfa_ee_act.cc

diff --git a/src/nfa/ee/nfa_ee_act.cc b/src/nfa/ee/nfa_ee_act.cc
index 743034d..8ef1fd0 100644
--- a/src/nfa/ee/nfa_ee_act.cc
+++ b/src/nfa/ee/nfa_ee_act.cc
@@ -885,12 +885,12 @@
     return;
   }
 
-  p_cb->tech_switch_on = p_data->set_tech.technologies_switch_on;
-  p_cb->tech_switch_off = p_data->set_tech.technologies_switch_off;
-  p_cb->tech_battery_off = p_data->set_tech.technologies_battery_off;
-  p_cb->tech_screen_lock = p_data->set_tech.technologies_screen_lock;
-  p_cb->tech_screen_off = p_data->set_tech.technologies_screen_off;
-  p_cb->tech_screen_off_lock = p_data->set_tech.technologies_screen_off_lock;
+  p_cb->tech_switch_on |= p_data->set_tech.technologies_switch_on;
+  p_cb->tech_switch_off |= p_data->set_tech.technologies_switch_off;
+  p_cb->tech_battery_off |= p_data->set_tech.technologies_battery_off;
+  p_cb->tech_screen_lock |= p_data->set_tech.technologies_screen_lock;
+  p_cb->tech_screen_off |= p_data->set_tech.technologies_screen_off;
+  p_cb->tech_screen_off_lock |= p_data->set_tech.technologies_screen_off_lock;
   nfa_ee_update_route_size(p_cb);
   if (nfa_ee_total_lmrt_size() > NFC_GetLmrtSize()) {
     LOG(ERROR) << StringPrintf("nfa_ee_api_set_tech_cfg Exceed LMRT size");