diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-11 01:25:15 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-11 01:25:15 +0000 |
| commit | 489d1240551dedb03b5056f73bbfa971376fdb0b (patch) | |
| tree | 953988ee33e7a973ce551288bb4840d361d319db /framework/java/android/bluetooth/BluetoothDevice.java | |
| parent | bbbf327c3cf4ef905abb11e41ee7b15c344b5523 (diff) | |
| parent | 08b0f5344d276b0b029bc907921516e4f7f1fa40 (diff) | |
Snap for 8710048 from 08b0f5344d276b0b029bc907921516e4f7f1fa40 to tm-release
Change-Id: I008e25fe03ab1cf6592e817eda1d6117092dcdbd
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index e20165f522..6618a55184 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -53,7 +53,6 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeoutException; @@ -2228,8 +2227,8 @@ public final class BluetoothDevice implements Parcelable, Attributable { new SynchronousResultReceiver(); service.getRemoteUuids(this, mAttributionSource, recv); List<ParcelUuid> parcels = recv.awaitResultNoInterrupt(getSyncTimeout()) - .getValue(new ArrayList<>()); - return parcels.toArray(new ParcelUuid[parcels.size()]); + .getValue(null); + return parcels != null ? parcels.toArray(new ParcelUuid[parcels.size()]) : null; } catch (RemoteException | TimeoutException e) { Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable())); } |