Restore default wired headset on FM power off

During factory reset, repeated FM on/off during a session were resulting
in selection of previous audio route. This restores the route to default.

CRs-Fixed: 972818
Change-Id: Ie2d3759363151bf991f890cd58155e184ad3331e

1 files changed, 11 insertions, 2 deletions

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index ff124f7..be18d6f 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -1691,20 +1691,29 @@ public class FMRadio extends Activity
    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();
          }