diff options
Diffstat (limited to 'fmapp2/src')
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadio.java | 6 | ||||
| -rw-r--r-- | fmapp2/src/com/caf/fmradio/FMRadioService.java | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java index 7307956..1d431f0 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadio.java +++ b/fmapp2/src/com/caf/fmradio/FMRadio.java @@ -1690,7 +1690,6 @@ public class FMRadio extends Activity private void disableRadio() { boolean bStatus = false; - boolean bSpeakerPhoneOn = isSpeakerEnabled(); cancelSearch(); endSleepTimer(); @@ -1709,11 +1708,6 @@ public class FMRadio extends Activity } enableRadioOnOffUI(); - // restore default wired headset on FM power off - if (bSpeakerPhoneOn) { - mService.enableSpeaker(false); - mSpeakerButton.setImageResource(R.drawable.btn_earphone); - } }catch (RemoteException e) { e.printStackTrace(); } diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java index 8e615db..ff76e1d 100644 --- a/fmapp2/src/com/caf/fmradio/FMRadioService.java +++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java @@ -2192,6 +2192,7 @@ public class FMRadioService extends Service * Turn OFF FM Operations: This disables all the current FM operations . */ private void fmOperationsOff() { + // stop recording if (isFmRecordingOn()) { stopRecording(); @@ -2202,14 +2203,19 @@ public class FMRadioService extends Service return; } } + // disable audio path AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); if(audioManager != null) { Log.d(LOGTAG, "audioManager.setFmRadioOn = false \n" ); stopFM(); - //audioManager.setParameters("FMRadioOn=false"); Log.d(LOGTAG, "audioManager.setFmRadioOn false done \n" ); } + // reset FM audio settings + if (isSpeakerEnabled() == true) + enableSpeaker(false); + if (isMuted() == true) + unMute(); if (isAnalogModeEnabled()) { SystemProperties.set("hw.fm.isAnalog","false"); |