From 53cea51d24a86a345c1d04231af7c831526488f5 Mon Sep 17 00:00:00 2001 From: Shaowei Shen Date: Tue, 18 Jan 2022 02:53:33 +0000 Subject: [PATCH] Revert "[Output Switcher] Enable volume control for single cast device" This reverts commit ad724437bd97759f19ff74a40cd7ce4a6fd4a265. Reason for revert: unreliable signal Change-Id: I373dd03cfe1c4711d83ae4f3105f561420a5df2e --- .../android/systemui/media/dialog/MediaOutputController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 4e0392790c5c6..83d581fb7897a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -539,7 +539,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { } boolean isVolumeControlEnabled(@NonNull MediaDevice device) { - return !device.getFeatures().contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK) + // TODO(b/202500642): Also enable volume control for remote non-group sessions. + return !isActiveRemoteDevice(device) || mVolumeAdjustmentForRemoteGroupSessions; }