diff options
| -rw-r--r-- | services/midi/java/com/android/server/midi/MidiService.java | 12 | 
1 files changed, 7 insertions, 5 deletions
| diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java index e1fe1d8433ef..90fd8edacce3 100644 --- a/services/midi/java/com/android/server/midi/MidiService.java +++ b/services/midi/java/com/android/server/midi/MidiService.java @@ -685,11 +685,13 @@ public class MidiService extends IMidiManager.Stub {      private boolean hasNonMidiUuids(BluetoothDevice btDevice) {          ParcelUuid[] uuidParcels = btDevice.getUuids(); -        // The assumption is that these services are indicative of devices that -        // ARE NOT MIDI devices. -        for (ParcelUuid parcel : uuidParcels) { -            if (mNonMidiUUIDs.contains(parcel)) { -                return true; +        if (uuidParcels != null) { +            // The assumption is that these services are indicative of devices that +            // ARE NOT MIDI devices. +            for (ParcelUuid parcel : uuidParcels) { +                if (mNonMidiUUIDs.contains(parcel)) { +                    return true; +                }              }          }          return false; |