commit 4069b5b04730fc3bef9119966df733820c18b65d
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Jun 27 10:57:39 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 27 10:57:39 2017 -0700
tree 0c063a5a39dbcfe958e86306b66765cb369f6ce4
parent f9047bc943b398571a361472dbac2798ba61279f
parent c2ee76bc4d96f6b0dafcc97e211a85d7182a5d38

Merge "FM: Convert notifications to use NotificationChannel"

fm_hci/fm_hci.cpp

diff --git a/fm_hci/fm_hci.cpp b/fm_hci/fm_hci.cpp
index 5b4475c..f10312b 100644
--- a/fm_hci/fm_hci.cpp
+++ b/fm_hci/fm_hci.cpp
@@ -43,6 +43,7 @@
 #include <thread>
 
 #include <utils/Log.h>
+#include <unistd.h>
 
 #include <vendor/qti/hardware/fm/1.0/IFmHci.h>
 #include <vendor/qti/hardware/fm/1.0/IFmHciCallbacks.h>
@@ -263,6 +264,7 @@
 static void  hci_tx_thread()
 {
     ALOGI("%s: ##### starting hci_tx_thread Worker thread!!! #####", __func__);
+    hci.is_tx_thread_running = true;
 
     while (hci.state != FM_RADIO_DISABLING && hci.state != FM_RADIO_DISABLED) {
         //wait  for tx cmd
@@ -272,6 +274,7 @@
         dequeue_fm_tx_cmd();
     }
 
+    hci.is_tx_thread_running =false;
     ALOGI("%s: ##### Exiting hci_tx_thread Worker thread!!! #####", __func__);
 }
 
@@ -291,6 +294,7 @@
 {
 
     ALOGI("%s: ##### starting hci_rx_thread Worker thread!!! #####", __func__);
+    hci.is_rx_thread_running = true;
 
     while (hci.state != FM_RADIO_DISABLING && hci.state != FM_RADIO_DISABLED) {
         //wait for rx event
@@ -299,6 +303,7 @@
         dequeue_fm_rx_event();
     }
 
+    hci.is_rx_thread_running = false;
     ALOGI("%s: ##### Exiting hci_rx_thread Worker thread!!! #####", __func__);
 }
 
@@ -612,6 +617,8 @@
     hci.command_credits = 1;
     hci.is_tx_processing = false;
     hci.is_rx_processing = false;
+    hci.is_tx_thread_running = false;
+    hci.is_rx_thread_running = false;
     hci.state = FM_RADIO_DISABLED;
     hci_hal->hci = &hci;
 
@@ -626,6 +633,13 @@
     }
 
     if (hci.state == FM_RADIO_ENABLED) {
+        while (hci.is_tx_thread_running == false
+            || hci.is_rx_thread_running == false)
+        {
+            /* checking tx & rx thread running status after every
+               5ms before notifying on to upper layer */
+            usleep(5000);
+        }
         ALOGD("--%s success", __func__);
         ret = FM_HC_STATUS_SUCCESS;
     } else {

fm_hci/fm_hci.h

diff --git a/fm_hci/fm_hci.h b/fm_hci/fm_hci.h
index 92c5942..5c48827 100644
--- a/fm_hci/fm_hci.h
+++ b/fm_hci/fm_hci.h
@@ -45,6 +45,9 @@
         bool is_tx_processing;
         bool is_rx_processing;
 
+        bool is_tx_thread_running;
+        bool is_rx_thread_running;
+
         std::condition_variable tx_cond;
         std::mutex tx_cond_mtx;