commit bb14ba96b440aa616cdd6026cf7d4a087945d405
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 23 16:44:57 2017 -0600
committer Linux Build Service Account <lnxbuild@localhost> Thu Mar 23 16:44:57 2017 -0600
tree 65851d37ffd87e1091a7c2330a7b9e337efb8ee1
parent 292627b08c0c4f8b2dbdb5939a1b86b0d76cd1e0
parent ec1b6abcce9177be1b3cac37f6b7c464188d60cb

Promotion of fm.lnx.2.1-00032.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2021892   Ia5f177f6f6727d837f7422505d196968ea0cd332   Do not reset slimbus on audio focus loss
2020487   I82891e12c83fe5d06dbfec060d1ace1231fc25fd   fm: Set lib_running variable only on cleanup

Change-Id: Ic10886c3b2771c1a01aa551ca8f6369f9adaf9bf
CRs-Fixed: 2020487, 2021892

fm_hci/fm_hci.c

diff --git a/fm_hci/fm_hci.c b/fm_hci/fm_hci.c
index 378e0c9..9d0dafc 100644
--- a/fm_hci/fm_hci.c
+++ b/fm_hci/fm_hci.c
@@ -229,7 +229,6 @@
                             pthread_cond_signal(&hci->cmd_credits_cond);
                         } 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;
                               hci->vendor->ssr_cleanup(0x22);
                               status  = power(hci, FM_RADIO_DISABLE);
                               if (status < 0) {

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 e5a7d83..52f9f77 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1586,8 +1586,6 @@
               switch (msg.arg1) {
                   case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
                       Log.v(LOGTAG, "AudioFocus: received AUDIOFOCUS_LOSS_TRANSIENT");
-                      if (mReceiver != null)
-                          mReceiver.EnableSlimbus(RESET_SLIMBUS_DATA_PORT);
                       if (true == isFmRecordingOn())
                           stopRecording();
                   case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
@@ -1600,9 +1598,6 @@
                   case AudioManager.AUDIOFOCUS_LOSS:
                       Log.v(LOGTAG, "AudioFocus: received AUDIOFOCUS_LOSS");
                       //intentional fall through.
-                      if (mReceiver != null)
-                          mReceiver.EnableSlimbus(RESET_SLIMBUS_DATA_PORT);
-
                       if (mSpeakerPhoneOn) {
                          mSpeakerDisableHandler.removeCallbacks(mSpeakerDisableTask);
                          mSpeakerDisableHandler.postDelayed(mSpeakerDisableTask, 0);