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

am 4be289e8: Merge "Route volume commands whenever media stream is in use" into lmp-dev

Browse Source 
* commit '4be289e84aba1fc5227fa518075fb8f2c60181ba':
  Route volume commands whenever media stream is in use
This commit is contained in:
RoboErik
2014-09-14 21:54:35 +00:00
committed by Android Git Automerger
parent 861da4e0ef d8c36a7b60
commit 74bc7de1ad
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");
}