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

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

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



Change-Id: Iddb6ee91dfa9ce56b867b9169d4c3ddbbe834fb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37596a2e a7b858cd

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

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




    private boolean hasNonMidiUuids(BluetoothDevice btDevice) {

    private boolean hasNonMidiUuids(BluetoothDevice btDevice) {

        ParcelUuid[] uuidParcels = btDevice.getUuids();

        ParcelUuid[] uuidParcels = btDevice.getUuids();

        if (uuidParcels != null) {

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

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

            // ARE NOT MIDI devices.

            // ARE NOT MIDI devices.

            for (ParcelUuid parcel : uuidParcels) {

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

                    return true;

                }

                }

            }

            }

        }

        return false;

        return false;

    }

    }