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

Commit d70af6f2 authored by William Escande's avatar William Escande
Browse files

AdapterService: Removing unncesseray null check 

mMetadataListeners is final not null
Also checking for a key before removing does not add value

Bug: 311772251
Test: m Bluetooth | no-op change
Flag: Exempt, no-op
Change-Id: I328388e902a8bd8eb7ae3e69efdba0d1f4673e26
parent 9c8cd344

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −9
Original line number Diff line number Diff line
@@ -4617,9 +4617,6 @@ public class AdapterService extends Service { 


            enforceBluetoothPrivilegedPermission(service);



            if (service.mMetadataListeners == null) {

                return false;

            }

            ArrayList<IBluetoothMetadataListener> list = service.mMetadataListeners.get(device);

            if (list == null) {

                list = new ArrayList<>();
@@ -4661,12 +4658,7 @@ public class AdapterService extends Service { 


            enforceBluetoothPrivilegedPermission(service);



            if (service.mMetadataListeners == null) {

                return false;

            }

            if (service.mMetadataListeners.containsKey(device)) {

            service.mMetadataListeners.remove(device);

            }

            return true;

        }