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

Commit 42d0f525 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad2480 am: 2d2920df 

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

Change-Id: Ida8204d2a37ed978ea7fecce6e412a80184058b0
parents c26aef96 2d2920df

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+1 −29
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.settingslib.media;



import static android.media.MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK;

import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP;

import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER;

import static android.media.MediaRoute2Info.TYPE_DOCK;
@@ -388,35 +387,8 @@ public class InfoMediaManager extends MediaManager { 


    @TargetApi(Build.VERSION_CODES.R)

    boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) {

        if (sessionInfo == null) {

            Log.w(TAG, "shouldEnableVolumeSeekBar() package name is null or empty!");

        return false;

    }

        final List<MediaRoute2Info> mediaRoute2Infos =

                mRouterManager.getSelectedRoutes(sessionInfo);

        // More than one selected route

        if (mediaRoute2Infos.size() > 1) {

            if (DEBUG) {

                Log.d(TAG, "shouldEnableVolumeSeekBar() package name : "

                        + sessionInfo.getClientPackageName()

                        + ", mediaRoute2Infos.size() " + mediaRoute2Infos.size());

            }

            return false;

        }

        // Route contains group feature

        for (MediaRoute2Info mediaRoute2Info : mediaRoute2Infos) {

            final List<String> features = mediaRoute2Info.getFeatures();

            if (features.contains(FEATURE_REMOTE_GROUP_PLAYBACK)) {

                if (DEBUG) {

                    Log.d(TAG, "shouldEnableVolumeSeekBar() package name : "

                            + mediaRoute2Info.getClientPackageName()

                            + "contain group playback ");

                }

                return false;

            }

        }

        return true;

    }



    private void refreshDevices() {

        mMediaDevices.clear();