From 0cf4179366e9b4b5ac24e63afe71be98bbdec730 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Mon, 28 Oct 2024 16:17:41 +0000
Subject: [CDM] Fix an IAE in CDDS

Fix: 375619113
Test: CTS
Flag: EXEMPT bugfix
Change-Id: I8293b652dc6bc7a131f7e6af9800e08a81936ac5
---
 .../companiondevicemanager/CompanionDeviceDiscoveryService.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'packages/CompanionDeviceManager/src')

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
index 6c1bc4ededce..f586e3dedf9a 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
@@ -238,7 +238,12 @@ public class CompanionDeviceDiscoveryService extends Service {
             // Cancel discovery.
             mBtAdapter.cancelDiscovery();
             // Unregister receiver.
-            unregisterReceiver(mBtReceiver);
+            try {
+                unregisterReceiver(mBtReceiver);
+            } catch (IllegalArgumentException e) {
+                Slog.e(TAG, "Unable to unregister BT receiver. The receiver is already"
+                        + " unregistered or was not previously registered.");
+            }
             mBtReceiver = null;
         }
 
-- 
cgit v1.2.3-59-g8ed1b