Merge "[Output Switcher] Enable volume for non-group device" into tm-dev am: 152e524ebe am: 83dfce49ef

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

Change-Id: Ia69013e723e22ecb196892b7c9fea2483422c91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shaowei Shen
2022-04-06 07:19:45 +00:00
committed by Automerger Merge Worker

View File

@@ -721,7 +721,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
boolean isVolumeControlEnabled(@NonNull MediaDevice device) {
return isPlayBackInfoLocal()
|| mLocalMediaManager.isMediaSessionAvailableForVolumeControl();
|| device.getDeviceType() != MediaDevice.MediaDeviceType.TYPE_CAST_GROUP_DEVICE;
}
@Override