Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "USB MIDI: Add null check on device removal" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-19 00:09:30 +00:00
committed by Android (Google) Code Review
parent 51f14d2581 b6a1953f21
commit 985c39fa4f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/usb/java/com/android/server/usb/UsbHostManager.java
View File

@@ -496,11 +496,13 @@ public class UsbHostManager {
// MIDI // MIDI
ArrayList<UsbDirectMidiDevice> midiDevices = ArrayList<UsbDirectMidiDevice> midiDevices =
mMidiDevices.remove(deviceAddress); mMidiDevices.remove(deviceAddress);
for (UsbDirectMidiDevice midiDevice : midiDevices) { if (midiDevices != null) {
if (midiDevice != null) { for (UsbDirectMidiDevice midiDevice : midiDevices) {
Slog.i(TAG, "USB MIDI Device Removed: " + deviceAddress); if (midiDevice != null) {
IoUtils.closeQuietly(midiDevice); IoUtils.closeQuietly(midiDevice);
}
} }
Slog.i(TAG, "USB MIDI Devices Removed: " + deviceAddress);
} }
getCurrentUserSettings().usbDeviceRemoved(device); getCurrentUserSettings().usbDeviceRemoved(device);