diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
old mode 100644
new mode 100755
index dfc1451..ee95e7b
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -4752,9 +4752,9 @@
         NFA_EE_HCI_Control(false);
         if(sNfceeHciCbDisableEvent.wait(500) == false)
         {
-            ALOGD("sNfceeHciCbDisableEvent.wait Timeout happened")
+            ALOGD("sNfceeHciCbDisableEvent.wait Timeout happened");
         }else{
-            ALOGD("sNfceeHciCbDisableEvent.wait success")
+            ALOGD("sNfceeHciCbDisableEvent.wait success");
         }
     }
 
@@ -4767,9 +4767,9 @@
         ALOGD("sNfceeHciCbEnableEvent waiting ......");
         if(sNfceeHciCbEnableEvent.wait (500) == false)
         {
-            ALOGD("sNfceeHciCbEnableEvent.wait Timeout happened")
+            ALOGD("sNfceeHciCbEnableEvent.wait Timeout happened");
         }else{
-            ALOGD("sNfceeHciCbEnableEvent.wait success")
+            ALOGD("sNfceeHciCbEnableEvent.wait success");
         }
 
     }
@@ -5695,7 +5695,7 @@
     return screenstate;
 }
 
-#if(NFC_NXP_ESE == TRUE && (NFC_NXP_CHIP_TYPE != PN547C2))
+#if(NFC_NXP_ESE == TRUE)
 /*******************************************************************************
 **
 ** Function:        isp2pActivated
diff --git a/nci/jni/NativeSecureElement.cpp b/nci/jni/NativeSecureElement.cpp
index 34cc4df..3a02704 100644
--- a/nci/jni/NativeSecureElement.cpp
+++ b/nci/jni/NativeSecureElement.cpp
@@ -75,6 +75,7 @@
 static const int EE_ERROR_IO = -1;
 static const int EE_ERROR_INIT = -3;
 static const int EE_ERROR_LISTEN_MODE = -4;
+static const int EE_ERROR_EXT_FIELD = -5;
 
 /*******************************************************************************
 **
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp
index 57489b5..250ac10 100644
--- a/nci/jni/RoutingManager.cpp
+++ b/nci/jni/RoutingManager.cpp
@@ -2208,7 +2208,7 @@
         break;
     case NFA_CE_DATA_EVT:
         {
-#if ((NFC_NXP_ESE == TRUE) && (NXP_EXTNS == TRUE))
+#if ((NFC_NXP_ESE == TRUE && NXP_NFCC_ESE_UICC_CONCURRENT_ACCESS_PROTECTION == true) && (NXP_EXTNS == TRUE))
 #if(NXP_ESE_DUAL_MODE_PRIO_SCHEME != NXP_ESE_WIRED_MODE_RESUME)
             se.setDwpTranseiveState(false, NFCC_CE_DATA_EVT);
 #endif