From 441d6a2b00dba60df11db588aceefcfd1cc429ed Mon Sep 17 00:00:00 2001 From: Santiago Seifert Date: Mon, 8 Apr 2024 12:52:36 +0000 Subject: Don't prevent group volume adjustment in SysUI Flag: NONE Test: Manually, using the MediaRouting demo app. Test: atest MediaOutputControllerTest Bug: b/329087598 Change-Id: Idf044cbc981e60675567c2c25bae45449ee700ec --- .../src/com/android/systemui/media/dialog/MediaOutputController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index adee7f2c86be..4db89d18ef7d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -1200,9 +1200,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, } boolean isVolumeControlEnabled(@NonNull MediaDevice device) { - return (isPlayBackInfoLocal() - || device.getDeviceType() != MediaDevice.MediaDeviceType.TYPE_CAST_GROUP_DEVICE) - && !device.isVolumeFixed(); + return !device.isVolumeFixed(); } @Override -- cgit v1.2.3-59-g8ed1b