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

Merge "Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c336c" into tm-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-05-05 16:53:49 +00:00
committed by Android (Google) Code Review
parent 14139a6779 0e8ba053ba
commit 4a4b632635
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/midi/java/com/android/server/midi/MidiService.java
View File

@@ -238,7 +238,7 @@ public class MidiService extends IMidiManager.Stub {
} }
} }
// called from Device.close() // called from Device.closeLocked()
public void removeDeviceConnection(DeviceConnection connection) { public void removeDeviceConnection(DeviceConnection connection) {
mDeviceConnections.remove(connection.getToken()); mDeviceConnections.remove(connection.getToken());
if (mListeners.size() == 0 && mDeviceConnections.size() == 0) { if (mListeners.size() == 0 && mDeviceConnections.size() == 0) {
@@ -294,12 +294,6 @@ public class MidiService extends IMidiManager.Stub {
} }
for (DeviceConnection connection : mDeviceConnections.values()) { for (DeviceConnection connection : mDeviceConnections.values()) {
if (connection.getDevice().getDeviceInfo().getType()
== MidiDeviceInfo.TYPE_USB) {
synchronized (mUsbMidiLock) {
removeUsbMidiDeviceLocked(connection.getDevice().getDeviceInfo());
}
}
connection.getDevice().removeDeviceConnection(connection); connection.getDevice().removeDeviceConnection(connection);
} }
} }
@@ -541,6 +535,13 @@ public class MidiService extends IMidiManager.Stub {
synchronized (mDeviceConnections) { synchronized (mDeviceConnections) {
mDeviceConnections.remove(connection); mDeviceConnections.remove(connection);
if (connection.getDevice().getDeviceInfo().getType()
== MidiDeviceInfo.TYPE_USB) {
synchronized (mUsbMidiLock) {
removeUsbMidiDeviceLocked(connection.getDevice().getDeviceInfo());
}
}
if (mDeviceConnections.size() == 0 && mServiceConnection != null) { if (mDeviceConnections.size() == 0 && mServiceConnection != null) {
mContext.unbindService(mServiceConnection); mContext.unbindService(mServiceConnection);
mServiceConnection = null; mServiceConnection = null;
@@ -559,6 +560,12 @@ public class MidiService extends IMidiManager.Stub {
public void closeLocked() { public void closeLocked() {
synchronized (mDeviceConnections) { synchronized (mDeviceConnections) {
for (DeviceConnection connection : mDeviceConnections) { for (DeviceConnection connection : mDeviceConnections) {
if (connection.getDevice().getDeviceInfo().getType()
== MidiDeviceInfo.TYPE_USB) {
synchronized (mUsbMidiLock) {
removeUsbMidiDeviceLocked(connection.getDevice().getDeviceInfo());
}
}
connection.getClient().removeDeviceConnection(connection); connection.getClient().removeDeviceConnection(connection);
} }
mDeviceConnections.clear(); mDeviceConnections.clear();
@@ -1401,6 +1408,8 @@ public class MidiService extends IMidiManager.Stub {
String deviceName = extractUsbDeviceName(name); String deviceName = extractUsbDeviceName(name);
String tagName = extractUsbDeviceTag(name); String tagName = extractUsbDeviceTag(name);
Log.i(TAG, "Checking " + deviceName + " " + tagName);
// Only one MIDI 2.0 device can be used at once. // Only one MIDI 2.0 device can be used at once.
// Multiple MIDI 1.0 devices can be used at once. // Multiple MIDI 1.0 devices can be used at once.
if (mUsbMidiUniversalDeviceInUse.contains(deviceName) if (mUsbMidiUniversalDeviceInUse.contains(deviceName)
@@ -1420,6 +1429,8 @@ public class MidiService extends IMidiManager.Stub {
String deviceName = extractUsbDeviceName(name); String deviceName = extractUsbDeviceName(name);
String tagName = extractUsbDeviceTag(name); String tagName = extractUsbDeviceTag(name);
Log.i(TAG, "Adding " + deviceName + " " + tagName);
if ((tagName).equals(MIDI_UNIVERSAL_STRING)) { if ((tagName).equals(MIDI_UNIVERSAL_STRING)) {
mUsbMidiUniversalDeviceInUse.add(deviceName); mUsbMidiUniversalDeviceInUse.add(deviceName);
} else if ((tagName).equals(MIDI_LEGACY_STRING)) { } else if ((tagName).equals(MIDI_LEGACY_STRING)) {
@@ -1437,6 +1448,8 @@ public class MidiService extends IMidiManager.Stub {
String deviceName = extractUsbDeviceName(name); String deviceName = extractUsbDeviceName(name);
String tagName = extractUsbDeviceTag(name); String tagName = extractUsbDeviceTag(name);
Log.i(TAG, "Removing " + deviceName + " " + tagName);
if ((tagName).equals(MIDI_UNIVERSAL_STRING)) { if ((tagName).equals(MIDI_UNIVERSAL_STRING)) {
mUsbMidiUniversalDeviceInUse.remove(deviceName); mUsbMidiUniversalDeviceInUse.remove(deviceName);
} else if ((tagName).equals(MIDI_LEGACY_STRING)) { } else if ((tagName).equals(MIDI_LEGACY_STRING)) {