From ad724437bd97759f19ff74a40cd7ce4a6fd4a265 Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Thu, 6 Jan 2022 08:32:33 +0000
Subject: [PATCH] [Output Switcher] Enable volume control for single cast
 device

Test: verified on device
Bug: 202500642
Bug: 206373080
Change-Id: Idac5b52e8bb3effe2ab290d8051a442294f8d7b0
---
 .../android/systemui/media/dialog/MediaOutputController.java   | 3 +--
 1 file changed, 1 insertion(+), 2 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 83d581fb7897a..4e0392790c5c6 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
@@ -539,8 +539,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
     }
 
     boolean isVolumeControlEnabled(@NonNull MediaDevice device) {
-        // TODO(b/202500642): Also enable volume control for remote non-group sessions.
-        return !isActiveRemoteDevice(device)
+        return !device.getFeatures().contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK)
             || mVolumeAdjustmentForRemoteGroupSessions;
     }