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

Commit 51295bd0 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Use BluetoothDevice.getAlias to populate MR2Info.getName 

This is a flagged change.

Bug: 314324170
Test: Manually.
Test: atest CtsMediaBetterTogetherTestCases (with flag on).
Change-Id: I6e8e318034b93131e3eb25de0ebcb168fe993cb9
parent 943986f8

media/java/android/media/flags/media_better_together.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -62,3 +62,10 @@ flag { 
    description: "Allows clients of privileged MediaRouter2 that hold INTERACT_ACROSS_USERS_FULL to control routing across users."

    bug: "288580225"

}



flag {

    name: "enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name"

    namespace: "media_solutions"

    description: "Use BluetoothDevice.getAlias to populate the name of Bluetooth MediaRoute2Infos."

    bug: "314324170"

}

services/core/java/com/android/server/media/AudioPoliciesBluetoothRouteController.java

+5 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.util.SparseBooleanArray; 


import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.media.flags.Flags;



import java.util.ArrayList;

import java.util.HashMap;
@@ -219,7 +220,10 @@ import java.util.stream.Collectors; 
        BluetoothRouteInfo

                newBtRoute = new BluetoothRouteInfo();

        newBtRoute.mBtDevice = device;

        String deviceName = device.getName();

        String deviceName =

                Flags.enableUseOfBluetoothDeviceGetAliasForMr2infoGetName()

                        ? device.getAlias()

                        : device.getName();

        if (TextUtils.isEmpty(deviceName)) {

            deviceName = mContext.getResources().getText(R.string.unknownName).toString();

        }

services/core/java/com/android/server/media/LegacyBluetoothRouteController.java

+5 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.util.SparseBooleanArray; 
import android.util.SparseIntArray;



import com.android.internal.R;

import com.android.media.flags.Flags;



import java.util.ArrayList;

import java.util.HashMap;
@@ -283,7 +284,10 @@ class LegacyBluetoothRouteController implements BluetoothRouteController { 
        newBtRoute.mBtDevice = device;



        String routeId = device.getAddress();

        String deviceName = device.getName();

        String deviceName =

                Flags.enableUseOfBluetoothDeviceGetAliasForMr2infoGetName()

                        ? device.getAlias()

                        : device.getName();

        if (TextUtils.isEmpty(deviceName)) {

            deviceName = mContext.getResources().getText(R.string.unknownName).toString();

        }