commit f6e06b911452c2c59a900ff69cff670fb8f1759d
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 23 13:09:16 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 23 13:09:16 2013 -0700
tree 98649de4378b5e0e35ecc11666d3b24d283f6988
parent db07236790caa377eee7e26538421b09181f80cf
parent 18bbe15e1be6f944379a03d88118ff9d8e98ca94

Merge "FM: Save Speaker on/off state"

fmapp/src/com/codeaurora/fmradio/FMRadioService.java

diff --git a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
index 5f2b42b..d467162 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
@@ -1133,7 +1133,7 @@
            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();
@@ -1268,9 +1268,8 @@
                           stopFM();
                       }
                       if (mSpeakerPhoneOn) {
-                          mSpeakerPhoneOn = false;
                           if (isAnalogModeSupported())
-                              setAudioPath(true);
+                              setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
                       break;