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

Merge "Fix volume slider not showing when casting in the background" into udc-dev am: f96e49ede6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23726250

Change-Id: I48000dd7f1f7a623eed935040f96593e5c1873b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bishoy Gendy
2023-06-22 08:12:36 +00:00
committed by Automerger Merge Worker
parent c497f8e509 f96e49ede6
commit 41af4c9fb7
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -16,6 +16,7 @@
package com.android.server.media;
import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_FIXED;
import static android.media.VolumeProvider.VOLUME_CONTROL_ABSOLUTE;
import static android.media.VolumeProvider.VOLUME_CONTROL_FIXED;
import static android.media.VolumeProvider.VOLUME_CONTROL_RELATIVE;
@@ -44,7 +45,9 @@ import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.AudioSystem;
import android.media.MediaMetadata;
import android.media.MediaRouter2Manager;
import android.media.Rating;
import android.media.RoutingSessionInfo;
import android.media.VolumeProvider;
import android.media.session.ISession;
import android.media.session.ISessionCallback;
@@ -510,7 +513,33 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
@Override
public boolean canHandleVolumeKey() {
return mVolumeControlType != VOLUME_CONTROL_FIXED;
if (isPlaybackTypeLocal()) {
return true;
}
if (mVolumeControlType == VOLUME_CONTROL_FIXED) {
return false;
}
if (mVolumeAdjustmentForRemoteGroupSessions) {
return true;
}
// See b/228021646 for details.
MediaRouter2Manager mRouter2Manager = MediaRouter2Manager.getInstance(mContext);
List<RoutingSessionInfo> sessions = mRouter2Manager.getRoutingSessions(mPackageName);
boolean foundNonSystemSession = false;
boolean remoteSessionAllowVolumeAdjustment = true;
for (RoutingSessionInfo session : sessions) {
if (!session.isSystemSession()) {
foundNonSystemSession = true;
if (session.getVolumeHandling() == PLAYBACK_VOLUME_FIXED) {
remoteSessionAllowVolumeAdjustment = false;
}
}
}
if (!foundNonSystemSession) {
Log.d(TAG, "Package " + mPackageName
+ " has a remote media session but no associated routing session");
}
return foundNonSystemSession && remoteSessionAllowVolumeAdjustment;
}
@Override