Merge "[CDM PS] Fix an NPE when the device is not associated" into main

2023-10-16 17:16:56 +00:00
parent ad3dede7c7 b139406d4b
commit 31fe9920ce
1 changed files with 5 additions and 0 deletions
--- 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(