commit cb4361e698dfa069926a8e4293db933860d49483
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 03 21:09:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 03 21:09:46 2017 +0000
tree 14b512112e17616c24997f0bb2281593a108ff08
parent 6b79a8601b2a0dfc18c3d941208d877246f592b8
parent 57443efd4365ac06a2e1e592ab8ae1814d021587

Merge "Fix watchdog trigged issue during stress test"

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 34fabdc..63ea82e 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -61,6 +61,8 @@
     extern void nativeNfcTag_abortWaits ();
     extern void nativeLlcpConnectionlessSocket_abortWait ();
     extern void nativeNfcTag_registerNdefTypeHandler ();
+    extern void nativeNfcTag_acquireRfInterfaceMutexLock();
+    extern void nativeNfcTag_releaseRfInterfaceMutexLock();
     extern void nativeLlcpConnectionlessSocket_receiveData (uint8_t* data, uint32_t len, uint32_t remote_sap);
 }
 
@@ -1952,6 +1954,7 @@
     tNFA_STATUS status = NFA_STATUS_FAILED;
 
     ALOGV("%s: is start=%d", __func__, isStart);
+    nativeNfcTag_acquireRfInterfaceMutexLock();
     SyncEventGuard guard (sNfaEnableDisablePollingEvent);
     status  = isStart ? NFA_StartRfDiscovery () : NFA_StopRfDiscovery ();
     if (status == NFA_STATUS_OK)
@@ -1963,6 +1966,7 @@
     {
         ALOGE("%s: Failed to start/stop RF discovery; error=0x%X", __func__, status);
     }
+    nativeNfcTag_releaseRfInterfaceMutexLock();
 }
 
 
@@ -2074,6 +2078,7 @@
         tech_mask = num;
     else if (tech_mask == 0) tech_mask = DEFAULT_TECH_MASK;
 
+    nativeNfcTag_acquireRfInterfaceMutexLock();
     SyncEventGuard guard (sNfaEnableDisablePollingEvent);
     ALOGV("%s: enable polling", __func__);
     stat = NFA_EnablePolling (tech_mask);
@@ -2087,6 +2092,7 @@
     {
         ALOGE("%s: fail enable polling; error=0x%X", __func__, stat);
     }
+    nativeNfcTag_releaseRfInterfaceMutexLock();
 
     return stat;
 }
@@ -2094,6 +2100,7 @@
 static tNFA_STATUS stopPolling_rfDiscoveryDisabled() {
     tNFA_STATUS stat = NFA_STATUS_FAILED;
 
+    nativeNfcTag_acquireRfInterfaceMutexLock();
     SyncEventGuard guard (sNfaEnableDisablePollingEvent);
     ALOGV("%s: disable polling", __func__);
     stat = NFA_DisablePolling ();
@@ -2103,6 +2110,7 @@
     } else {
         ALOGE("%s: fail disable polling; error=0x%X", __func__, stat);
     }
+    nativeNfcTag_releaseRfInterfaceMutexLock();
 
     return stat;
 }

nci/jni/NativeNfcTag.cpp

diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index 98a8800..e9b5668 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -1841,6 +1841,36 @@
     sNdefTypeHandlerHandle = NFA_HANDLE_INVALID;
 }
 
+/*******************************************************************************
+**
+** Function:        nativeNfcTag_acquireRfInterfaceMutexLock
+**
+** Description:     acquire sRfInterfaceMutex
+**
+** Returns:         None
+**
+*******************************************************************************/
+void nativeNfcTag_acquireRfInterfaceMutexLock()
+{
+    ALOGD("%s: try to acquire lock", __func__);
+    sRfInterfaceMutex.lock();
+    ALOGD("%s: sRfInterfaceMutex lock", __func__);
+}
+
+/*******************************************************************************
+**
+** Function:       nativeNfcTag_releaseRfInterfaceMutexLock
+**
+** Description:    release the sRfInterfaceMutex
+**
+** Returns:        None
+**
+*******************************************************************************/
+void nativeNfcTag_releaseRfInterfaceMutexLock()
+{
+    sRfInterfaceMutex.unlock();
+    ALOGD("%s: sRfInterfaceMutex unlock", __func__);
+}
 
 /*****************************************************************************
 **