Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0a6b4f9 authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "[CDM] Fix an IAE in CDDS" into main

parents 9d02f16a 0cf41793

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java

+6 −1
Original line number Diff line number Diff line
@@ -238,7 +238,12 @@ public class CompanionDeviceDiscoveryService extends Service { 
            // Cancel discovery.

            mBtAdapter.cancelDiscovery();

            // Unregister receiver.

            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;

        }