Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8776cd2 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Enable volume for non-group device" into tm-dev am:... 

Merge "[Output Switcher] Enable volume for non-group device" into tm-dev am: 152e524e am: 5b9ed0b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397148



Change-Id: I803c2af8ae4cfc67d40f94672fca50a707421817
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9cb6071f 5b9ed0b1

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 


    boolean isVolumeControlEnabled(@NonNull MediaDevice device) {

        return isPlayBackInfoLocal()

                || mLocalMediaManager.isMediaSessionAvailableForVolumeControl();

                || device.getDeviceType() != MediaDevice.MediaDeviceType.TYPE_CAST_GROUP_DEVICE;

    }



    @Override