FM: Save Speaker on/off state

FM resumes on BT headset after MO call from BT
headset is ended, even though FM was on speaker
before starting MO call, save the speaker on/off
state before turning off FM as part of focus loss,
incomming/outgoing call notification

Change-Id: I903da7614e06a8ae1279e99f62ec3eb0b715c2ba
CRs-Fixed: 483329

1 files changed, 2 insertions, 3 deletions

diff --git a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
index 20f0262..fc791d1 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
@@ -1131,7 +1131,7 @@ public class FMRadioService extends Service
            boolean bTempSpeaker = mSpeakerPhoneOn; //need to restore SpeakerPhone
            boolean bTempMute = mMuted;// need to restore Mute status
            int bTempCall = mCallStatus;//need to restore call status
-           if (fmOff()) {
+           if (isFmOn() && fmOff()) {
                if((mServiceInUse) && (mCallbacks != null)) {
                    try {
                         mCallbacks.onDisabled();
@@ -1266,9 +1266,8 @@ private Runnable mSpeakerDisableTask = new Runnable() {
                           stopFM();
                       }
                       if (mSpeakerPhoneOn) {
-                          mSpeakerPhoneOn = false;
                           if (isAnalogModeSupported())
-                              setAudioPath(true);
+                              setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
                       break;