diff options
| author | 2017-03-09 01:52:59 +0000 | |
|---|---|---|
| committer | 2017-03-09 01:53:03 +0000 | |
| commit | 40101efd1a36dbb739a7adb6eda3528b89b4859f (patch) | |
| tree | e6e9f9d02756ff588b6c46852af0e8e2ed8da1d3 | |
| parent | 9042dddb245dc69f72dde13e7bf4a61fbad6d6d6 (diff) | |
| parent | 952f2341abc398d245f3c0a577ebe1b28f93f368 (diff) | |
Merge "Audio focus: framework enforces ducking"
| -rw-r--r-- | services/core/java/com/android/server/audio/MediaFocusControl.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/PlaybackActivityMonitor.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/audio/MediaFocusControl.java b/services/core/java/com/android/server/audio/MediaFocusControl.java index abdcfe78a516..b3f1548d4d92 100644 --- a/services/core/java/com/android/server/audio/MediaFocusControl.java +++ b/services/core/java/com/android/server/audio/MediaFocusControl.java @@ -46,9 +46,9 @@ public class MediaFocusControl implements PlayerFocusEnforcer { /** * set to true so the framework enforces ducking itself, without communicating to apps - * that they lost focus. + * that they lost focus for most use cases. */ - static final boolean ENFORCE_DUCKING = false; + static final boolean ENFORCE_DUCKING = true; /** * set to true so the framework enforces muting media/game itself when the device is ringing * or in a call. diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index 6932427ba969..82a0ff690b62 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -309,7 +309,7 @@ public final class PlaybackActivityMonitor return false; } else { try { - if (DEBUG) { Log.v(TAG, "ducking player " + piid); } + Log.v(TAG, "ducking player " + piid); apc.getPlayerProxy().applyVolumeShaper( DUCK_VSHAPE, PLAY_CREATE_IF_NEEDED); @@ -339,7 +339,7 @@ public final class PlaybackActivityMonitor if (apc != null && winner.hasSameUid(apc.getClientUid())) { try { - if (DEBUG) { Log.v(TAG, "unducking player" + piid); } + Log.v(TAG, "unducking player" + piid); mDuckedPlayers.remove(new Integer(piid)); apc.getPlayerProxy().applyVolumeShaper( DUCK_ID, @@ -381,11 +381,11 @@ public final class PlaybackActivityMonitor } if (mute) { try { - if (DEBUG) { Log.v(TAG, "muting player" + piid); } + Log.v(TAG, "call: muting player" + piid); apc.getPlayerProxy().setVolume(0.0f); mMutedPlayers.add(piid); } catch (Exception e) { - Log.e(TAG, "Error muting player " + piid, e); + Log.e(TAG, "call: error muting player " + piid, e); } } } @@ -405,10 +405,10 @@ public final class PlaybackActivityMonitor final AudioPlaybackConfiguration apc = mPlayers.get(piid); if (apc != null) { try { - if (DEBUG) { Log.v(TAG, "unmuting player" + piid); } + Log.v(TAG, "call: unmuting player" + piid); apc.getPlayerProxy().setVolume(1.0f); } catch (Exception e) { - Log.e(TAG, "Error unmuting player " + piid, e); + Log.e(TAG, "call: error unmuting player " + piid, e); } } } |