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

Commit 4d2f1de0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when getService return null" am: 1dfdf11b am: 4a1fcdde 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2147699



Change-Id: I20315bc9f5a8aba097c2f48ff31d0c4cc0c9caf6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 015cf832 4a1fcdde

android/app/src/com/android/bluetooth/map/BluetoothMapService.java

+1 −1
Original line number Diff line number Diff line
@@ -1318,9 +1318,9 @@ public class BluetoothMapService extends ProfileService { 
            }

            try {

                BluetoothMapService service = getService(source);

                enforceBluetoothPrivilegedPermission(service);

                List<BluetoothDevice> connectedDevices = new ArrayList<>(0);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    connectedDevices = service.getConnectedDevices();

                }

                receiver.send(connectedDevices);