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

Commit 3018986f authored by Paul Mclean's avatar Paul Mclean Committed by Automerger Merge Worker
Browse files

Merge "Check for null Parcels array in hasNonMidiUuids." into tm-dev am: a7b858cd am: 37b2a1fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570954



Change-Id: I42dfa21a339c9f9313d8f7f850fee4b14a8a3f61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09c6f418 37b2a1fa

services/midi/java/com/android/server/midi/MidiService.java

+7 −5
Original line number Diff line number Diff line
@@ -685,6 +685,7 @@ public class MidiService extends IMidiManager.Stub { 


    private boolean hasNonMidiUuids(BluetoothDevice btDevice) {

        ParcelUuid[] uuidParcels = btDevice.getUuids();

        if (uuidParcels != null) {

            // The assumption is that these services are indicative of devices that

            // ARE NOT MIDI devices.

            for (ParcelUuid parcel : uuidParcels) {
@@ -692,6 +693,7 @@ public class MidiService extends IMidiManager.Stub { 
                    return true;

                }

            }

        }

        return false;

    }