From b139406d4bebe4467b161d2b31d74bda5591154b Mon Sep 17 00:00:00 2001 From: Guojing Yuan Date: Thu, 12 Oct 2023 17:40:53 +0000 Subject: [PATCH] [CDM PS] Fix an NPE when the device is not associated Bug: 290063372 Test: manually tested Change-Id: Ifd55e2849ebaff1340fdf9e61edd75971187e12b --- .../bluetooth/BluetoothDetailsDataSyncController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java index a8cd85f2814..81c5689845a 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java @@ -112,6 +112,11 @@ public class BluetoothDetailsDataSyncController extends BluetoothDetailsControll mPreferenceCategory.addPreference(permSyncPref); } + if (mAssociationId == DUMMY_ASSOCIATION_ID) { + permSyncPref.setVisible(false); + return; + } + boolean visible = false; boolean checked = false; PermissionSyncRequest request = mCompanionDeviceManager.getPermissionSyncRequest(