Promotion of fm.lnx.1.0-00015.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
972818 Ie2d3759363151bf991f890cd58155e184ad3331e Restore default wired headset on FM power off
Change-Id: Ibc6ba99f2f1cbd73600aae8aa707d2b4bffc1bb3
CRs-Fixed: 972818
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index e7f1c51..20b1133 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -1680,20 +1680,29 @@
private void disableRadio() {
boolean bStatus = false;
boolean bSpeakerPhoneOn = isSpeakerEnabled();
+
cancelSearch();
endSleepTimer();
+
+ // Stop if there is an ongoing Record
if(mRecording) {
- //Stop if there is an ongoing Record
stopRecording();
}
+
if(mService != null) {
try {
bStatus = mService.fmOff();
- enableRadioOnOffUI();
if (bStatus == false) {
mCommandFailed = CMD_FMOFF;
Log.e(LOGTAG, " mService.fmOff failed");
}
+
+ 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();
}