summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkexiao <kexiao@codeaurora.org>2015-12-21 16:04:00 +0800
committerArne Coucheron <arco68@gmail.com>2016-03-22 00:14:15 +0100
commit97cca41851acb2d101f20fc4632cbf6ee476d7a9 (patch)
treec0e322f6758596db9afa33ba2ea4bae4b9a439d9
parentd7dd0544ff3b6470a74bbc2b5f751f6d8d76ecf8 (diff)
downloadandroid_hardware_qcom_fm-97cca41851acb2d101f20fc4632cbf6ee476d7a9.tar.gz
android_hardware_qcom_fm-97cca41851acb2d101f20fc4632cbf6ee476d7a9.tar.bz2
android_hardware_qcom_fm-97cca41851acb2d101f20fc4632cbf6ee476d7a9.zip
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
-rw-r--r--fmapp2/src/com/caf/fmradio/FMRadio.java3
-rw-r--r--fmapp2/src/com/caf/fmradio/FMRadioService.java10
2 files changed, 5 insertions, 8 deletions
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);
+ }
}
/*