commit c95089cf00e71114c16096c46fda25d1069815e5
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 29 04:58:29 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 29 04:58:29 2016 -0700
tree f0695005ac43a0cf6e4e09cf05089912200d8407
parent 1567b30dc9eb67d66a1e91446b65173b94de2612
parent 43a4f71274fca4bbe0915e6990d7dd3fe249bd0d

Merge "FM: Wait to be completely closed before processing next start"

fm_hci/fm_hci.c

diff --git a/fm_hci/fm_hci.c b/fm_hci/fm_hci.c
index 0cf2de8..d559b74 100644
--- a/fm_hci/fm_hci.c
+++ b/fm_hci/fm_hci.c
@@ -265,8 +265,7 @@
                         } else if (pbuf->evt_code == FM_HW_ERR_EVENT) {
                               ALOGI("%s: FM H/w Err Event Recvd. Event Code: 0x%2x", __func__, pbuf->evt_code);
                               lib_running =0;
-                              // commented till bt vendor include added
-                             // fm_vnd_if->ssr_cleanup(0x22);
+                              fm_vnd_if->ssr_cleanup(0x22);
                         } else {
                             ALOGI("%s: Not CS/CC Event: Recvd. Event Code: 0x%2x", __func__, pbuf->evt_code);
                             evt_type = -1;

fmapp2/src/com/caf/fmradio/FMRadioService.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 1986917..0c5713b 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1580,12 +1580,14 @@
                               setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
+                      mSession.setActive(false);
                       break;
                   case AudioManager.AUDIOFOCUS_GAIN:
                       Log.v(LOGTAG, "AudioFocus: received AUDIOFOCUS_GAIN");
                       if(false == mPlaybackInProgress)
                           startFM();
                       mStoppedOnFocusLoss = false;
+                      mSession.setActive(true);
                       break;
                   default:
                       Log.e(LOGTAG, "Unknown audio focus change code"+msg.arg1);