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

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

Merge "Fix a crash when sending service discovery uuids" am: 2f873def am:... 

Merge "Fix a crash when sending service discovery uuids" am: 2f873def am: 8ab3a131 am: c896b8c3

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



Change-Id: I3e589193a167dd23cccb129aa41cddba5bebbac7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f4e68bb c896b8c3

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

+8 −0
Original line number Diff line number Diff line
@@ -7101,6 +7101,14 @@ public class AdapterService extends Service { 
     * @param uuids are the services supported on the remote device

     */

    void sendUuidsInternal(BluetoothDevice device, ParcelUuid[] uuids) {

        if (device == null) {

            Log.w(TAG, "sendUuidsInternal: null device");

            return;

        }

        if (uuids == null) {

            Log.w(TAG, "sendUuidsInternal: uuids is null");

            return;

        }

        Log.i(TAG, "sendUuidsInternal: Received service discovery UUIDs for device " + device);

        if (DBG) {

            for (int i = 0; i < uuids.length; i++) {