From 4cd66d15d764c4045056c55c16b41e1707fd4319 Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Mon, 9 Aug 2021 07:19:12 +0000
Subject: [PATCH] Disable volume control bar for all remote devices

Bug: 189270378
Test: manual test
Change-Id: Id5ca32ffb86ac634a41b5ba077f76f2842e747e8
---
 .../android/systemui/media/dialog/MediaOutputController.java    | 2 +-
 1 file changed, 1 insertion(+), 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 5293c88502670..b2def7a8596a0 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
@@ -466,7 +466,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
     }
 
     boolean isVolumeControlEnabled(@NonNull MediaDevice device) {
-        return !device.getFeatures().contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK);
+        return !isActiveRemoteDevice(device);
     }
 
     private final MediaController.Callback mCb = new MediaController.Callback() {