Merge "Restore eDtaMode after NCI SetConfig"
diff --git a/src/nfa/dm/nfa_dm_main.cc b/src/nfa/dm/nfa_dm_main.cc
index fe03a5b..3f8e268 100644
--- a/src/nfa/dm/nfa_dm_main.cc
+++ b/src/nfa/dm/nfa_dm_main.cc
@@ -439,6 +439,9 @@
       /* Increment setcfg_pending counter */
       nfa_dm_cb.setcfg_pending_num++;
     }
+    if ((nfa_dm_cb.eDtaMode & NFA_DTA_HCEF_MODE) == NFA_DTA_HCEF_MODE) {
+      nfa_dm_cb.eDtaMode &= ~NFA_DTA_HCEF_MODE;
+    }
     return (nfc_status);
 
   } else {