Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Route volume commands whenever media stream is in use" into lmp-dev

Browse Source
This commit is contained in:
RoboErik
2014-09-14 21:45:01 +00:00
committed by Android (Google) Code Review
parent 49b03451f9 94c716ea29
commit d8c36a7b60
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/media/MediaSessionService.java
View File

@@ -31,6 +31,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.ContentObserver;
import android.media.AudioManager;
import android.media.AudioSystem;
import android.media.IAudioService;
import android.media.IRemoteVolumeController;
import android.media.session.IActiveSessionsListener;
@@ -800,7 +801,8 @@ public class MediaSessionService extends SystemService implements Monitor {
}
if (session == null) {
if ((flags & AudioManager.FLAG_ACTIVE_MEDIA_ONLY) != 0) {
if ((flags & AudioManager.FLAG_ACTIVE_MEDIA_ONLY) != 0
&& !AudioSystem.isStreamActive(AudioManager.STREAM_MUSIC, 0)) {
if (DEBUG) {
Log.d(TAG, "No active session to adjust, skipping media only volume event");
}