commit a1bafe4e09fa5100cbb5a7e4da8b04156002e35e
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Mon Apr 16 06:37:51 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 16 06:37:51 2018 -0700
tree 1cbede07f5ea43f4a20bc2e3be598e53ea8df3b0
parent 92ff2d42b0b484af0207c9541775cbaa832f8fa6
parent 96120491ec6fe25a37febdb8551af24912e51f3c

Merge "FM: add setRssiThreshold support for Pronto chip" into fm.lnx.2.9.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 b9dc5a8..36c486b 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1673,15 +1673,17 @@
                           Log.v(LOGTAG, "Focus Loss/TLoss - Disabling speaker");
                           AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
                       }
-                      if (mReceiver != null && (mReceiver.isCherokeeChip()))
-                          mReceiver.EnableSlimbus(ENABLE_SLIMBUS_DATA_PORT);
+                      if ((mReceiver != null) && mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+                          mEventReceived = false;
+                          mReceiver.EnableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
+                          waitForFWEvent();
+                      }
+                      mStoppedOnFocusLoss = true;
+
                       if (true == mPlaybackInProgress) {
                           stopFM();
                       }
 
-                      if ((mReceiver != null) && mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true)))
-                          mReceiver.EnableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
-                      mStoppedOnFocusLoss = true;
                       break;
                   case AudioManager.AUDIOFOCUS_LOSS:
                       Log.v(LOGTAG, "AudioFocus: received AUDIOFOCUS_LOSS mspeakerphone= " +
@@ -1691,14 +1693,17 @@
                           mSpeakerDisableHandler.removeCallbacks(mSpeakerDisableTask);
                           mSpeakerDisableHandler.postDelayed(mSpeakerDisableTask, 0);
                       }
+
+                      //intentional fall through.
+                      if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true))) {
+                          mEventReceived = false;
+                          mReceiver.EnableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
+                          waitForFWEvent();
+                      }
                       if (true == mPlaybackInProgress) {
                           stopFM();
                       }
 
-                      //intentional fall through.
-                      if (mReceiver.isCherokeeChip() && (mPref.getBoolean("SLIMBUS_SEQ", true)))
-                          mReceiver.EnableSlimbus(DISABLE_SLIMBUS_DATA_PORT);
-
                       if (true == isFmRecordingOn())
                           stopRecording();