From 97cca41851acb2d101f20fc4632cbf6ee476d7a9 Mon Sep 17 00:00:00 2001
From: kexiao <kexiao@codeaurora.org>
Date: Mon, 21 Dec 2015 16:04:00 +0800
Subject: FM: stop AudioTrack before switching output device

When FM sound comes out from speaker, turn off
FM then the sound come out from headset for 0.5s.
Make sure the AudioTrack is stopped before
switching output device.

CRs-Fixed: 940232
Change-Id: I55da27408371cad4af90a7ec3dc7e8a52736096c
---
 fmapp2/src/com/caf/fmradio/FMRadio.java        |  3 ---
 fmapp2/src/com/caf/fmradio/FMRadioService.java | 10 +++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'fmapp2/src/com')

diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 7814418..78d3b64 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -1685,9 +1685,6 @@ public class FMRadio extends Activity
       }
       if(mService != null) {
          try {
-            if(bSpeakerPhoneOn) {
-               mService.enableSpeaker(false);
-            }
             bStatus = mService.fmOff();
             enableRadioOnOffUI();
             if (bStatus == false) {
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 0510a6b..ef7ea4d 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2163,11 +2163,6 @@ public class FMRadioService extends Service
    * 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();
@@ -2216,6 +2211,11 @@ public class FMRadioService extends Service
               SystemProperties.set("hw.fm.isAnalog","false");
               misAnalogPathEnabled = false;
       }
+
+      if ( mSpeakerPhoneOn) {
+          mSpeakerPhoneOn = false;
+          AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
+      }
    }
 
   /*
-- 
cgit v1.2.3