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

Commit 98655686 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Handle null BT device name" into rvc-dev am: 672ebfc2 am: 853c44b9 

Change-Id: If466bc6fb401149a5783ed7440e4bc3c7631e80e
parents 8ae92390 853c44b9

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

+6 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.media.AudioManager;

import android.media.MediaRoute2Info;

import android.text.TextUtils;

import android.util.Slog;

import android.util.SparseBooleanArray;
@@ -210,7 +211,11 @@ class BluetoothRouteProvider { 
        newBtRoute.btDevice = device;

        // Current / Max volume will be set when connected.

        // TODO: Is there any BT device which has fixed volume?

        newBtRoute.route = new MediaRoute2Info.Builder(device.getAddress(), device.getName())

        String deviceName = device.getName();

        if (TextUtils.isEmpty(deviceName)) {

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

        }

        newBtRoute.route = new MediaRoute2Info.Builder(device.getAddress(), deviceName)

                .addFeature(MediaRoute2Info.FEATURE_LIVE_AUDIO)

                .setConnectionState(MediaRoute2Info.CONNECTION_STATE_DISCONNECTED)

                .setDescription(mContext.getResources().getText(