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

Merge "USB MIDI: Don't call openLocked on device unplug" into tm-dev

Browse Source
This commit is contained in:
Robert Wu
2022-05-13 14:25:26 +00:00
committed by Android (Google) Code Review
parent 97bbf5804a 139be68185
commit 5a5ccbe0f2
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java
View File

@@ -89,38 +89,36 @@ public final class UsbDirectMidiDevice implements Closeable {
private final Object mLock = new Object();
private boolean mIsOpen;
private boolean mServerAvailable;
private UsbMidiPacketConverter mUsbMidiPacketConverter;
private final MidiDeviceServer.Callback mCallback = new MidiDeviceServer.Callback() {
@Override
public void onDeviceStatusChanged(MidiDeviceServer server, MidiDeviceStatus status) {
MidiDeviceInfo deviceInfo = status.getDeviceInfo();
int numInputPorts = deviceInfo.getInputPortCount();
int numOutputPorts = deviceInfo.getOutputPortCount();
boolean hasOpenPorts = false;
int numOpenPorts = 0;
for (int i = 0; i < numInputPorts; i++) {
if (status.isInputPortOpen(i)) {
hasOpenPorts = true;
break;
numOpenPorts++;
}
}
if (!hasOpenPorts) {
for (int i = 0; i < numOutputPorts; i++) {
if (status.getOutputPortOpenCount(i) > 0) {
hasOpenPorts = true;
break;
}
for (int i = 0; i < numOutputPorts; i++) {
if (status.getOutputPortOpenCount(i) > 0) {
numOpenPorts += status.getOutputPortOpenCount(i);
}
}
synchronized (mLock) {
if (hasOpenPorts && !mIsOpen) {
Log.d(TAG, "numOpenPorts: " + numOpenPorts + " isOpen: " + mIsOpen
+ " mServerAvailable: " + mServerAvailable);
if ((numOpenPorts > 0) && !mIsOpen && mServerAvailable) {
openLocked();
} else if (!hasOpenPorts && mIsOpen) {
} else if ((numOpenPorts == 0) && mIsOpen) {
closeLocked();
}
}
@@ -348,7 +346,7 @@ public final class UsbDirectMidiDevice implements Closeable {
final UsbRequest response = connectionFinal.requestWait();
if (response != request) {
Log.w(TAG, "Unexpected response");
continue;
break;
}
int bytesRead = byteBuffer.position();
@@ -462,7 +460,7 @@ public final class UsbDirectMidiDevice implements Closeable {
mContext = context;
MidiManager midiManager = context.getSystemService(MidiManager.class);
if (midiManager == null) {
Log.e(TAG, "No MidiManager in UsbDirectMidiDevice.create()");
Log.e(TAG, "No MidiManager in UsbDirectMidiDevice.register()");
return false;
}
@@ -499,6 +497,7 @@ public final class UsbDirectMidiDevice implements Closeable {
mUsbDevice.getSerialNumber());
properties.putParcelable(MidiDeviceInfo.PROPERTY_USB_DEVICE, mUsbDevice);
mServerAvailable = true;
mServer = midiManager.createDeviceServer(mMidiInputPortReceivers, mNumInputs,
null, null, properties, MidiDeviceInfo.TYPE_USB, mDefaultMidiProtocol, mCallback);
if (mServer == null) {
@@ -514,6 +513,7 @@ public final class UsbDirectMidiDevice implements Closeable {
if (mIsOpen) {
closeLocked();
}
mServerAvailable = false;
}
if (mServer != null) {

32
services/usb/java/com/android/server/usb/UsbMidiDevice.java
View File

@@ -71,40 +71,38 @@ public final class UsbMidiDevice implements Closeable {
private final Object mLock = new Object();
private boolean mIsOpen;
private boolean mServerAvailable;
// pipe file descriptor for signalling input thread to exit
// only accessed from JNI code
private int mPipeFD = -1;
private final MidiDeviceServer.Callback mCallback = new MidiDeviceServer.Callback() {
@Override
public void onDeviceStatusChanged(MidiDeviceServer server, MidiDeviceStatus status) {
MidiDeviceInfo deviceInfo = status.getDeviceInfo();
int inputPorts = deviceInfo.getInputPortCount();
int outputPorts = deviceInfo.getOutputPortCount();
boolean hasOpenPorts = false;
int numInputPorts = deviceInfo.getInputPortCount();
int numOutputPorts = deviceInfo.getOutputPortCount();
int numOpenPorts = 0;
for (int i = 0; i < inputPorts; i++) {
for (int i = 0; i < numInputPorts; i++) {
if (status.isInputPortOpen(i)) {
hasOpenPorts = true;
break;
numOpenPorts++;
}
}
if (!hasOpenPorts) {
for (int i = 0; i < outputPorts; i++) {
if (status.getOutputPortOpenCount(i) > 0) {
hasOpenPorts = true;
break;
}
for (int i = 0; i < numOutputPorts; i++) {
if (status.getOutputPortOpenCount(i) > 0) {
numOpenPorts += status.getOutputPortOpenCount(i);
}
}
synchronized (mLock) {
if (hasOpenPorts && !mIsOpen) {
Log.d(TAG, "numOpenPorts: " + numOpenPorts + " isOpen: " + mIsOpen
+ " mServerAvailable: " + mServerAvailable);
if ((numOpenPorts > 0) && !mIsOpen && mServerAvailable) {
openLocked();
} else if (!hasOpenPorts && mIsOpen) {
} else if ((numOpenPorts == 0) && mIsOpen) {
closeLocked();
}
}
@@ -298,10 +296,11 @@ public final class UsbMidiDevice implements Closeable {
private boolean register(Context context, Bundle properties) {
MidiManager midiManager = (MidiManager)context.getSystemService(Context.MIDI_SERVICE);
if (midiManager == null) {
Log.e(TAG, "No MidiManager in UsbMidiDevice.create()");
Log.e(TAG, "No MidiManager in UsbMidiDevice.register()");
return false;
}
mServerAvailable = true;
mServer = midiManager.createDeviceServer(mMidiInputPortReceivers, mNumInputs,
null, null, properties, MidiDeviceInfo.TYPE_USB,
MidiDeviceInfo.PROTOCOL_UNKNOWN, mCallback);
@@ -318,6 +317,7 @@ public final class UsbMidiDevice implements Closeable {
if (mIsOpen) {
closeLocked();
}
mServerAvailable = false;
}
if (mServer != null) {