commit 15a15bda8525dab8dfbfd669e4a06c9e9264759a
author Linux Build Service Account <lnxbuild@localhost> Tue Dec 29 05:13:18 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 29 05:13:18 2015 -0800
tree 749ac6cd743556e3e365432643c1e864a67e6218
parent 7ee062569e8589d7842af7d1651d67fd48e6c752
parent 6d42131e371957e7c2fe0ae722f22b6b09801b77

Merge "FM: stop AudioTrack before switching output device" into fm.lnx.1.0-dev.1.0

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 5cfd5a6..b025d4f 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -1675,9 +1675,6 @@
       }
       if(mService != null) {
          try {
-            if(bSpeakerPhoneOn) {
-               mService.enableSpeaker(false);
-            }
             bStatus = mService.fmOff();
             enableRadioOnOffUI();
             if (bStatus == false) {

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 149c248..65e42bb 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2108,11 +2108,6 @@
    * Turn OFF FM Operations: This disables all the current FM operations             .
    */
    private void fmOperationsOff() {
-      if ( mSpeakerPhoneOn)
-      {
-          mSpeakerPhoneOn = false;
-          AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
-      }
       if (isFmRecordingOn())
       {
           stopRecording();
@@ -2161,6 +2156,11 @@
               SystemProperties.set("hw.fm.isAnalog","false");
               misAnalogPathEnabled = false;
       }
+
+      if ( mSpeakerPhoneOn) {
+          mSpeakerPhoneOn = false;
+          AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
+      }
    }
 
   /*