Merge cherrypicks of ['googleplex-android-review.googlesource.com/24790419'] into udc-qpr1-release.

Change-Id: I09829d921d2ce765837c84d017129898e8fb4729
2023-09-19 00:29:29 +00:00
parent cd8d435005 777fbef46c
commit c6ee8eb841
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
@@ -65,6 +65,7 @@ public class BluetoothDetailsDataSyncController extends BluetoothDetailsControll
        mCompanionDeviceManager = context.getSystemService(CompanionDeviceManager.class);

        mCompanionDeviceManager.getAllAssociations().stream().filter(
+                a -> a.getDeviceMacAddress() != null).filter(
                a -> Objects.equal(mCachedDevice.getAddress(),
                        a.getDeviceMacAddress().toString().toUpperCase())).max(
                Comparator.comparingLong(AssociationInfo::getTimeApprovedMs)).ifPresent(