diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-02-20 08:28:47 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2015-02-23 14:32:23 -0800 |
| commit | b673770f7172d4fca9bc05de1f36bc53e93eb247 (patch) | |
| tree | 5d58c97188d3d7c4f9d7faf5376e586374a17624 /services/usb/java/com/android | |
| parent | c3c2ff70a23ff31bec72e7794ea33552ca106438 (diff) | |
| download | frameworks_base-b673770f7172d4fca9bc05de1f36bc53e93eb247.zip frameworks_base-b673770f7172d4fca9bc05de1f36bc53e93eb247.tar.gz frameworks_base-b673770f7172d4fca9bc05de1f36bc53e93eb247.tar.bz2 | |
Add MIDI Manager API tweaks:
- Change the package name from android.midi to android.media.midi
- Add option for specifying a Handler for DeviceCallback notifications
Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
Diffstat (limited to 'services/usb/java/com/android')
3 files changed, 7 insertions, 8 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java index 009d25d..0aa8862 100644 --- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java +++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java @@ -26,7 +26,7 @@ import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbInterface; import android.media.AudioSystem; import android.media.IAudioService; -import android.midi.MidiDeviceInfo; +import android.media.midi.MidiDeviceInfo; import android.os.FileObserver; import android.os.Bundle; import android.os.IBinder; diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index be115b2..43c7336 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -31,7 +31,6 @@ import android.database.ContentObserver; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbManager; import android.media.AudioManager; -import android.midi.MidiDeviceInfo; import android.os.FileUtils; import android.os.Handler; import android.os.Looper; diff --git a/services/usb/java/com/android/server/usb/UsbMidiDevice.java b/services/usb/java/com/android/server/usb/UsbMidiDevice.java index 396ed38..e17abc0 100644 --- a/services/usb/java/com/android/server/usb/UsbMidiDevice.java +++ b/services/usb/java/com/android/server/usb/UsbMidiDevice.java @@ -17,12 +17,12 @@ package com.android.server.usb; import android.content.Context; -import android.midi.MidiDeviceInfo; -import android.midi.MidiDeviceServer; -import android.midi.MidiManager; -import android.midi.MidiPort; -import android.midi.MidiReceiver; -import android.midi.MidiSender; +import android.media.midi.MidiDeviceInfo; +import android.media.midi.MidiDeviceServer; +import android.media.midi.MidiManager; +import android.media.midi.MidiPort; +import android.media.midi.MidiReceiver; +import android.media.midi.MidiSender; import android.os.Bundle; import android.system.ErrnoException; import android.system.Os; |