commit 2a55da6cd0570ce8405bad81137fc1e20613217c
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 10 23:47:17 2016 -0800
committer Linux Build Service Account <lnxbuild@localhost> Thu Mar 10 23:47:17 2016 -0800
tree 0b12eeaa6ecbba1422feb410595a1610aaa45f9d
parent 0b7b7fededbb2e15d563e956dbd20eef68faedc4
parent 1314b05014f3f52dd4cc32440af15ab70fbd28fb

Promotion of fm.lnx.1.0-00018.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
981687   Ibb9f18e49fdcd9f07cea4006748bab48bd87216c   Reset FM audio settings on off.

Change-Id: Ic0667be94eaad7ae13c92b8bcb1cce32aec1beac
CRs-Fixed: 981687

fmapp2/src/com/caf/fmradio/FMRadio.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 9c44add..909a14c 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -1679,7 +1679,6 @@
 
    private void disableRadio() {
       boolean bStatus = false;
-      boolean bSpeakerPhoneOn = isSpeakerEnabled();
 
       cancelSearch();
       endSleepTimer();
@@ -1698,11 +1697,6 @@
             }
 
             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();
          }

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 0231997..83018f5 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2137,6 +2137,7 @@
    * Turn OFF FM Operations: This disables all the current FM operations             .
    */
    private void fmOperationsOff() {
+      // stop recording
       if (isFmRecordingOn())
       {
           stopRecording();
@@ -2147,14 +2148,19 @@
                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");