Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev

    void closeDevice();

    // connects the input port pfd to the specified output port

    void connectPorts(IBinder token, in ParcelFileDescriptor pfd, int outputPortNumber);

    // Returns the PID of the called process.

    int connectPorts(IBinder token, in ParcelFileDescriptor pfd, int outputPortNumber);

    MidiDeviceInfo getDeviceInfo();

    void setDeviceInfo(in MidiDeviceInfo deviceInfo);

import android.os.Binder;

import android.os.IBinder;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.os.RemoteException;

import android.util.Log;

        }

         try {

            IBinder token = new Binder();

            mDeviceServer.connectPorts(token, pfd, outputPortNumber);

            int calleePid = mDeviceServer.connectPorts(token, pfd, outputPortNumber);

            // If the service is a different Process then it will duplicate the pfd

            // and we can safely close this one.

            // But if the service is in the same Process then closing the pfd will

            // kill the connection. So don't do that.

            if (calleePid != Process.myPid()) {

                // close our copy of the file descriptor

                IoUtils.closeQuietly(pfd);

            }

            return new MidiConnection(token, inputPort);

        } catch (RemoteException e) {

            Log.e(TAG, "RemoteException in connectPorts");

        }

        @Override

        public void connectPorts(IBinder token, ParcelFileDescriptor pfd,

        public int connectPorts(IBinder token, ParcelFileDescriptor pfd,

                int outputPortNumber) {

            MidiInputPort inputPort = new MidiInputPort(pfd, outputPortNumber);

            MidiDispatcher dispatcher = mOutputPortDispatchers[outputPortNumber];

            synchronized (mPortClients) {

                mPortClients.put(token, client);

            }

            return Process.myPid(); // for caller to detect same process ID

        }

        @Override