summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2014-12-10 19:44:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-10 19:44:39 +0000
commit4d9698c81abcecade70e2031b24217b090a9e837 (patch)
tree84a274c674e56778f7e58eafe357165fd6198852
parent88d727c827bf45bcdb7dc89972b470fe4ffec6ef (diff)
parent87970e48c151b8b9533889f317dad79499ced1a0 (diff)
downloadandroid_packages_apps_FMRadio-4d9698c81abcecade70e2031b24217b090a9e837.tar.gz
android_packages_apps_FMRadio-4d9698c81abcecade70e2031b24217b090a9e837.tar.bz2
android_packages_apps_FMRadio-4d9698c81abcecade70e2031b24217b090a9e837.zip
Merge "[FM] FM Radio should reduce volume when getting AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK" into lmp-mr1-dev
-rw-r--r--src/com/android/fmradio/FmService.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/fmradio/FmService.java b/src/com/android/fmradio/FmService.java
index c62027e..236dfdf 100644
--- a/src/com/android/fmradio/FmService.java
+++ b/src/com/android/fmradio/FmService.java
@@ -2031,6 +2031,7 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
*/
@Override
public void onAudioFocusChange(int focusChange) {
+ Log.d(TAG, "onAudioFocusChange " + focusChange);
switch (focusChange) {
case AudioManager.AUDIOFOCUS_LOSS:
synchronized (this) {
@@ -2054,6 +2055,13 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
}
break;
+ case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+ synchronized (this) {
+ updateAudioFocusAync(
+ AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+ }
+ break;
+
default:
break;
}
@@ -2132,6 +2140,11 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
bundle.putFloat(FM_FREQUENCY, FmUtils.computeFrequency(mCurrentStation));
handlePowerUp(bundle);
}
+ setMute(false);
+ break;
+
+ case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+ setMute(true);
break;
default: