From ea9ccba5c6f95bbf00cc9482912b27ef1ad3dfd8 Mon Sep 17 00:00:00 2001 From: Paul McLean Date: Mon, 4 Apr 2022 10:12:51 -0600 Subject: Check for null Parcels array in hasNonMidiUuids. Bug: 226555921 Test: build, install, connect BLE-MIDI controller. Change-Id: Ib86f9981eaaf1763c46a12dddefbf84d2542ebc5 --- services/midi/java/com/android/server/midi/MidiService.java | 12 +++++++----- 1 file 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; -- cgit v1.2.3-59-g8ed1b