| commit | dfc20ff94100e82d29b4a145c567f41dcc606e93 | [log] [tgz] |
|---|---|---|
| author | Guojing Yuan <guojing@google.com> | Mon Sep 18 23:17:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:17:16 2023 +0000 |
| tree | ac4b49c647d7369a95d615d2990ef1b9ddfe748c | |
| parent | 7549d613e633777bd2c65069c16b52db98e42521 [diff] | |
| parent | cf705cf8732193627544a91010aeed3b16af02e5 [diff] |
[CDM Perm Sync] Fix a NPE for Perm Sync toggle am: 8c51d9c71d am: cf705cf873 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24790419 Change-Id: I10fccd7b4036a57cdb665eb22a79b600fb006898 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java index 5969ada..a8cd85f 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
@@ -64,6 +64,7 @@ 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(