From 07767907d51468eb29a19353e8b1595bacd53d74 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Wed, 20 May 2020 17:02:43 +0800
Subject: [PATCH] Show subtext for previously connected devices on BT card

Fixes: 157089483
Test: visual, robotest
Change-Id: If4f2dec9df802a80a686827de7e61115e85d54a7
---
 .../contextualcards/slices/BluetoothDevicesSlice.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index 79be26decd3..8b74313b8bf 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -294,10 +294,15 @@ public class BluetoothDevicesSlice implements CustomSliceable {
         final List<ListBuilder.RowBuilder> bluetoothRows = new ArrayList<>();
         // Create row builders based on paired devices.
         for (CachedBluetoothDevice device : getPairedBluetoothDevices()) {
+            String summary = device.getConnectionSummary();
+            if (summary == null) {
+                summary = mContext.getString(
+                        R.string.connected_device_previously_connected_screen_title);
+            }
             final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
                     .setTitleItem(getBluetoothDeviceIcon(device), ListBuilder.ICON_IMAGE)
                     .setTitle(device.getName())
-                    .setSubtitle(device.getConnectionSummary());
+                    .setSubtitle(summary);
 
             if (mAvailableMediaBtDeviceUpdater.isFilterMatched(device)
                     || mSavedBtDeviceUpdater.isFilterMatched(device)) {