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

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

Merge "Add MIDI Manager API tweaks:"

parents 4b8b2263 b673770f

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -174,9 +174,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \

	core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \

	core/java/android/hardware/usb/IUsbManager.aidl \

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

	core/java/android/midi/IMidiListener.aidl \

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

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/net/IEthernetManager.aidl \

	core/java/android/net/IEthernetServiceListener.aidl \
@@ -336,6 +333,9 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IRingtonePlayer.aidl \

	media/java/android/media/IVolumeController.aidl \

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

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

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

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

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

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

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

core/java/android/app/ContextImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -75,12 +75,12 @@ import android.location.ILocationManager; 
import android.location.LocationManager;

import android.media.AudioManager;

import android.media.MediaRouter;

import android.media.midi.IMidiManager;

import android.media.midi.MidiManager;

import android.media.projection.MediaProjectionManager;

import android.media.session.MediaSessionManager;

import android.media.tv.ITvInputManager;

import android.media.tv.TvInputManager;

import android.midi.IMidiManager;

import android.midi.MidiManager;

import android.net.ConnectivityManager;

import android.net.IConnectivityManager;

import android.net.EthernetManager;

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ public abstract class Context { 


    /**

     * Use with {@link #getSystemService} to retrieve a

     * {@link android.midi.MidiManager} for accessing the MIDI service.

     * {@link android.media.midi.MidiManager} for accessing the MIDI service.

     *

     * @see #getSystemService

     * @hide

core/java/android/midi/IMidiDeviceServer.aidl→media/java/android/media/midi/IMidiDeviceServer.aidl

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.midi;

package android.media.midi;



import android.os.ParcelFileDescriptor;

core/java/android/midi/IMidiListener.aidl→media/java/android/media/midi/IMidiListener.aidl

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



package android.midi;

package android.media.midi;



import android.midi.MidiDeviceInfo;

import android.media.midi.MidiDeviceInfo;



/** @hide */

oneway interface IMidiListener