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

Commit e0a6ca64 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MidiManager: proxy all requests to open devices through MidiService 

Previously when a MidiManager client opened a virtual or Bluetooth device,
the client bound directly to the virtual device's MidiDeviceService
or BluetoothMidiDevice's IMidiDeviceServer for the given BluetoothDevice.
Only USB devices were opened in MidiService.

Now opening any type of MIDI device is done via IMidiManager.openDevice() or
IMidiManager.openBluetoothDevice().  MidiService tracks all connnections between
clients and devices.

Services that implement virtual devices must now require android.permission.BIND_MIDI_DEVICE_SERVICE
so only MidiService can bind to these services.

Bug: 21044677

Change-Id: I7172f7b1e0cbfe4a2a87dff376c32dc9b41aa563
parent ec7100d0

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IVolumeController.aidl \

	media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \

	media/java/android/media/midi/IMidiDeviceListener.aidl \

	media/java/android/media/midi/IMidiDeviceOpenCallback.aidl \

	media/java/android/media/midi/IMidiDeviceServer.aidl \

	media/java/android/media/midi/IMidiManager.aidl \

	media/java/android/media/projection/IMediaProjection.aidl \

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ package android { 
    field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";

    field public static final java.lang.String BIND_INCALL_SERVICE = "android.permission.BIND_INCALL_SERVICE";

    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";

    field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";

    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";

    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
@@ -17312,6 +17313,7 @@ package android.media.midi { 
    method public final android.media.midi.MidiDeviceInfo getDeviceInfo();

    method public final android.media.midi.MidiReceiver[] getOutputPortReceivers();

    method public android.os.IBinder onBind(android.content.Intent);

    method public void onClose();

    method public void onDeviceStatusChanged(android.media.midi.MidiDeviceStatus);

    method public abstract android.media.midi.MidiReceiver[] onGetInputPortReceivers();

    field public static final java.lang.String SERVICE_INTERFACE = "android.media.midi.MidiDeviceService";

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ package android { 
    field public static final java.lang.String BIND_INCALL_SERVICE = "android.permission.BIND_INCALL_SERVICE";

    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";

    field public static final java.lang.String BIND_KEYGUARD_APPWIDGET = "android.permission.BIND_KEYGUARD_APPWIDGET";

    field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";

    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";

    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
@@ -18618,6 +18619,7 @@ package android.media.midi { 
    method public final android.media.midi.MidiDeviceInfo getDeviceInfo();

    method public final android.media.midi.MidiReceiver[] getOutputPortReceivers();

    method public android.os.IBinder onBind(android.content.Intent);

    method public void onClose();

    method public void onDeviceStatusChanged(android.media.midi.MidiDeviceStatus);

    method public abstract android.media.midi.MidiReceiver[] onGetInputPortReceivers();

    field public static final java.lang.String SERVICE_INTERFACE = "android.media.midi.MidiDeviceService";

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ final class SystemServiceRegistry { 
            @Override

            public MidiManager createService(ContextImpl ctx) {

                IBinder b = ServiceManager.getService(Context.MIDI_SERVICE);

                return new MidiManager(ctx, IMidiManager.Stub.asInterface(b));

                return new MidiManager(IMidiManager.Stub.asInterface(b));

            }});



        registerService(Context.RADIO_SERVICE, RadioManager.class,

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1828,6 +1828,11 @@ 
    <permission android:name="android.permission.BIND_INPUT_METHOD"

        android:protectionLevel="signature" />



    <!-- Must be required by an {@link android.media.midi.MidiDeviceService},

         to ensure that only the system can bind to it. -->

    <permission android:name="android.permission.BIND_MIDI_DEVICE_SERVICE"

        android:protectionLevel="signature" />



    <!-- Must be required by an {@link android.accessibilityservice.AccessibilityService},

         to ensure that only the system can bind to it. -->

    <permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"