Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c36a7b authored by RoboErik's avatar RoboErik Committed by Android (Google) Code Review
Browse files

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

parents 49b03451 94c716ea

services/core/java/com/android/server/media/MediaSessionService.java

+3 −1
Original line number Diff line number Diff line
@@ -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");

                    }