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

Commit dd6649ed 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: efe29024 

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



Change-Id: If295b85aa877a2b033024acbc3bede0eac0d1eaa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 825dec9d efe29024

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;

    }