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

Commit 383ce580 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev

parents e4bd7c98 e0a6ca64

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,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
@@ -28,6 +28,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";
@@ -17360,6 +17361,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
@@ -40,6 +40,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";
@@ -18672,6 +18673,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
@@ -1827,6 +1827,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"