diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2013-07-23 13:09:16 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-07-23 13:09:16 -0700 |
commit | f6e06b911452c2c59a900ff69cff670fb8f1759d (patch) | |
tree | 98649de4378b5e0e35ecc11666d3b24d283f6988 /fmapp | |
parent | db07236790caa377eee7e26538421b09181f80cf (diff) | |
parent | 18bbe15e1be6f944379a03d88118ff9d8e98ca94 (diff) | |
download | android_hardware_qcom_fm-f6e06b911452c2c59a900ff69cff670fb8f1759d.tar.gz android_hardware_qcom_fm-f6e06b911452c2c59a900ff69cff670fb8f1759d.tar.bz2 android_hardware_qcom_fm-f6e06b911452c2c59a900ff69cff670fb8f1759d.zip |
Merge "FM: Save Speaker on/off state"
Diffstat (limited to 'fmapp')
-rw-r--r-- | fmapp/src/com/codeaurora/fmradio/FMRadioService.java | 5 |
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 5f2b42b..d467162 100644 --- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java +++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java @@ -1133,7 +1133,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(); @@ -1268,9 +1268,8 @@ private Runnable mSpeakerDisableTask = new Runnable() { stopFM(); } if (mSpeakerPhoneOn) { - mSpeakerPhoneOn = false; if (isAnalogModeSupported()) - setAudioPath(true); + setAudioPath(false); } mStoppedOnFocusLoss = true; break; |