commit 1bb60704be9a23ad6ca11c9253a528290ca718f5
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 02 08:20:38 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Aug 02 08:20:38 2013 -0700
tree d8b4f55a6f93dcc5dbb8096b18bca633668f8ce8
parent 3c842318357bf79574be64468d06aa8b4141aad2
parent b7cd23bd2f2057891cada5dc1dbda714595ab8e6

Merge "FM-APP2: Save Speaker on/off state"

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 f3b0a78..df52734 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -902,7 +902,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();
@@ -1037,9 +1037,8 @@
                           stopFM();
                       }
                       if (mSpeakerPhoneOn) {
-                          mSpeakerPhoneOn = false;
                           if (isAnalogModeSupported())
-                              setAudioPath(true);
+                              setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
                       break;