Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e0044fa authored by Robert Wu's avatar Robert Wu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18297858



Change-Id: Ia7601a1f98d54394520f56874748d4bb6294bed2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a95084b1 fde49f6e

services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java

+14 −14
Original line number Diff line number Diff line
@@ -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;

                    }

                    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) {

services/usb/java/com/android/server/usb/UsbMidiDevice.java

+16 −16
Original line number Diff line number Diff line
@@ -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++) {

            for (int i = 0; i < numOutputPorts; i++) {

                if (status.getOutputPortOpenCount(i) > 0) {

                        hasOpenPorts = true;

                        break;

                    }

                    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) {