commit 5486b3a607725b7a43a01738d69921fe69e51dcb
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 06 07:25:24 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 06 07:25:24 2017 +0000
tree 8cea63d42d36db0d39147b813b862299ec809bd1
parent 6744524f23c7bcc1096b16d23b306eb1cedb7a66
parent 09a303c04a4e679d752e7469dfcdce41e8e02deb

release-request-49fb627d-ebdd-4558-ae95-935e31212986-for-git_oc-dr1-release-4157297 snap-temp-L13700000079944578

Change-Id: Idb5993464aa4486757cb3e0ce7f55f94327ec438

src/com/android/car/settings/bluetooth/BluetoothDeviceListAdapter.java

diff --git a/src/com/android/car/settings/bluetooth/BluetoothDeviceListAdapter.java b/src/com/android/car/settings/bluetooth/BluetoothDeviceListAdapter.java
index 8bbcabb..68bd564 100644
--- a/src/com/android/car/settings/bluetooth/BluetoothDeviceListAdapter.java
+++ b/src/com/android/car/settings/bluetooth/BluetoothDeviceListAdapter.java
@@ -197,9 +197,9 @@
         holder.mTitle.setText(bluetoothDevice.getName());
         Pair<Integer, String> pair = getBtClassDrawableWithDescription(bluetoothDevice);
         holder.mIcon.setImageResource(pair.first);
-        int summaryResourceId = bluetoothDevice.getConnectionSummary();
-        if (summaryResourceId != 0) {
-            holder.mDesc.setText(summaryResourceId);
+        String summaryText = bluetoothDevice.getConnectionSummary();
+        if (summaryText != null) {
+            holder.mDesc.setText(summaryText);
             holder.mDesc.setVisibility(View.VISIBLE);
         } else {
             holder.mDesc.setVisibility(View.GONE);