summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-05-20 21:30:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-20 21:30:45 +0000
commit1a48ffee7d6fa42fcd737060da52ef6794c83567 (patch)
treeade144370f513b3fbbbcbf465f2edcb7f1f0e731
parent26e2ce86a0ccf9d2bfe1a3364be5dcca4d555b03 (diff)
parentd18934b50611530db05a14ba3dfd001b1d4fb998 (diff)
Merge "Don't prevent group volume adjustment in SysUI" into 24D1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java4
1 files changed, 1 insertions, 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 b3b7bceea0e0..fd08daf733f6 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
@@ -1188,9 +1188,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