commit 528ee194626270329b1c482cd7bd7502d01bcd1f
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 24 01:03:44 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 24 01:03:44 2020 +0000
tree deb3041729a79fcc8b5e053540100ead9d6dde5a
parent 1df12f9e1a0e9576ce3706e40bb076d343bb92ce
parent 42574fdfa1783ff3b218a0b1a28a0fd4e8956898

Snap for 6424828 from 42574fdfa1783ff3b218a0b1a28a0fd4e8956898 to rvc-release

Change-Id: I2798fe1480c4d846cc00c5fe411d3d55413f59d0

halimpl/tml/phDal4Nfc_messageQueueLib.cc

diff --git a/halimpl/tml/phDal4Nfc_messageQueueLib.cc b/halimpl/tml/phDal4Nfc_messageQueueLib.cc
index f43774d..e3c70b8 100755
--- a/halimpl/tml/phDal4Nfc_messageQueueLib.cc
+++ b/halimpl/tml/phDal4Nfc_messageQueueLib.cc
@@ -59,7 +59,7 @@
       (phDal4Nfc_message_queue_t*)malloc(sizeof(phDal4Nfc_message_queue_t));
   if (pQueue == NULL) return -1;
   memset(pQueue, 0, sizeof(phDal4Nfc_message_queue_t));
-  if (pthread_mutex_init(&pQueue->nCriticalSectionMutex, NULL) == -1) {
+  if (pthread_mutex_init(&pQueue->nCriticalSectionMutex, NULL) != 0) {
     free(pQueue);
     return -1;
   }

halimpl/tml/phTmlNfc.cc

diff --git a/halimpl/tml/phTmlNfc.cc b/halimpl/tml/phTmlNfc.cc
index 643764d..b3135c1 100644
--- a/halimpl/tml/phTmlNfc.cc
+++ b/halimpl/tml/phTmlNfc.cc
@@ -113,7 +113,7 @@
         gpphTmlNfc_Context->tReadInfo.bThreadBusy = false;
         gpphTmlNfc_Context->tWriteInfo.bThreadBusy = false;
         if (pthread_mutex_init(&gpphTmlNfc_Context->readInfoUpdateMutex,
-                               NULL) == -1) {
+                               NULL) != 0) {
           wInitStatus = NFCSTATUS_FAILED;
         } else if (0 != sem_init(&gpphTmlNfc_Context->rxSemaphore, 0, 0)) {
           wInitStatus = NFCSTATUS_FAILED;

halimpl/utils/phNxpNciHal_utils.cc

diff --git a/halimpl/utils/phNxpNciHal_utils.cc b/halimpl/utils/phNxpNciHal_utils.cc
index c1a14f4..57aa819 100644
--- a/halimpl/utils/phNxpNciHal_utils.cc
+++ b/halimpl/utils/phNxpNciHal_utils.cc
@@ -36,7 +36,7 @@
 *******************************************************************************/
 int listInit(struct listHead* pList) {
   pList->pFirst = NULL;
-  if (pthread_mutex_init(&pList->mutex, NULL) == -1) {
+  if (pthread_mutex_init(&pList->mutex, NULL) != 0) {
     NXPLOG_NCIHAL_E("Mutex creation failed (errno=0x%08x)", errno);
     return 0;
   }
@@ -59,7 +59,7 @@
     bListNotEmpty = listGetAndRemoveNext(pList, NULL);
   }
 
-  if (pthread_mutex_destroy(&pList->mutex) == -1) {
+  if (pthread_mutex_destroy(&pList->mutex) != 0) {
     NXPLOG_NCIHAL_E("Mutex destruction failed (errno=0x%08x)", errno);
     return 0;
   }
@@ -266,12 +266,12 @@
   if (nxpncihal_monitor != NULL) {
     memset(nxpncihal_monitor, 0x00, sizeof(phNxpNciHal_Monitor_t));
 
-    if (pthread_mutex_init(&nxpncihal_monitor->reentrance_mutex, NULL) == -1) {
+    if (pthread_mutex_init(&nxpncihal_monitor->reentrance_mutex, NULL) != 0) {
       NXPLOG_NCIHAL_E("reentrance_mutex creation returned 0x%08x", errno);
       goto clean_and_return;
     }
 
-    if (pthread_mutex_init(&nxpncihal_monitor->concurrency_mutex, NULL) == -1) {
+    if (pthread_mutex_init(&nxpncihal_monitor->concurrency_mutex, NULL) != 0) {
       NXPLOG_NCIHAL_E("concurrency_mutex creation returned 0x%08x", errno);
       pthread_mutex_destroy(&nxpncihal_monitor->reentrance_mutex);
       goto clean_and_return;