Merge "[CDM] Catch IllegalArgumentException when association is not found" into main

2024-05-28 16:48:37 +00:00
parent 3e46f1f1c9 dc2e0e227a
commit 854227055d
1 changed files with 6 additions and 2 deletions
--- a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
@@ -124,8 +124,12 @@ public class BluetoothDetailsDataSyncController extends BluetoothDetailsControll

        boolean visible = false;
        boolean checked = false;
-        PermissionSyncRequest request = mCompanionDeviceManager.getPermissionSyncRequest(
-                mAssociationId);
+        PermissionSyncRequest request = null;
+        try {
+            request = mCompanionDeviceManager.getPermissionSyncRequest(mAssociationId);
+        } catch (IllegalArgumentException e) {
+            // no-op, keep request null.
+        }
        if (request != null) {
            visible = true;
            if (request.isUserConsented()) {