From 2f19fd1834dc301910b4fedac42ad682a3ea5053 Mon Sep 17 00:00:00 2001 From: Sungsoo Lim Date: Thu, 7 May 2020 09:53:09 +0900 Subject: [PATCH] Handle null BT device name Bug: 154667991 Test: pass MediaRouter2 tests Change-Id: I1b07575f912ba9cae26102ffed98bcc33c6fa343 --- .../com/android/server/media/BluetoothRouteProvider.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java index 3cf22c85f9243..54958d3470965 100644 --- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java +++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java @@ -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(