summaryrefslogtreecommitdiffstats
path: root/fmapp
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-07-12 05:17:20 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-07-12 05:17:20 -0700
commit8a35aeaf789f32057e987982f061d3345881b073 (patch)
tree95452fad53ad64757572a90ca5034183ef610c3c /fmapp
parent8bdf325f3b332bc9fc15ec7270c7fd58d319169f (diff)
parent6e3541c96081751855662f9e581099f1ffa3bbf9 (diff)
downloadandroid_hardware_qcom_fm-8a35aeaf789f32057e987982f061d3345881b073.tar.gz
android_hardware_qcom_fm-8a35aeaf789f32057e987982f061d3345881b073.tar.bz2
android_hardware_qcom_fm-8a35aeaf789f32057e987982f061d3345881b073.zip
Merge "FM: Unmute music stream when FM app lost audio focus"
Diffstat (limited to 'fmapp')
-rw-r--r--fmapp/src/com/codeaurora/fmradio/FMRadioService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
index 0bf8f1e..909a5a4 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
@@ -1260,8 +1260,11 @@ private Runnable mSpeakerDisableTask = new Runnable() {
mSpeakerDisableHandler.removeCallbacks(mSpeakerDisableTask);
mSpeakerDisableHandler.postDelayed(mSpeakerDisableTask, 0);
}
- if (true == mPlaybackInProgress)
+ if (true == mPlaybackInProgress) {
+ if (mMuted)
+ unMute();
stopFM();
+ }
if (mSpeakerPhoneOn) {
mSpeakerPhoneOn = false;
if (isAnalogModeSupported())