commit c35acdbc777e1a1c5a5303b6f32f06d3aa363338
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 14 05:29:12 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 14 05:29:12 2023 +0000
tree dde0cf015ea3b46ccafb586495a2f4415e3ebcd8
parent 4af7da4ae257863f95eb170f1037318bb2dd199b
parent 6440752c50ca8ac8ca80b7d2cdaab409bbdac737

Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev

src/com/android/server/telecom/CallEndpointController.java

diff --git a/src/com/android/server/telecom/CallEndpointController.java b/src/com/android/server/telecom/CallEndpointController.java
index 82164b3..7e11b47 100644
--- a/src/com/android/server/telecom/CallEndpointController.java
+++ b/src/com/android/server/telecom/CallEndpointController.java
@@ -247,8 +247,9 @@
                     for (BluetoothDevice device : state.getSupportedBluetoothDevices()) {
                         CallEndpoint endpoint = findMatchingBluetoothEndpoint(device);
                         if (endpoint == null) {
+                            String deviceName = device.getName();
                             endpoint = new CallEndpoint(
-                                    device.getName() != null ? device.getName() : "",
+                                    deviceName != null ? deviceName : "",
                                     CallEndpoint.TYPE_BLUETOOTH);
                         }
                         newAvailableEndpoints.add(endpoint);