diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioDevicesManager.java | 9 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/media/java/android/media/AudioDevicesManager.java b/media/java/android/media/AudioDevicesManager.java index 4e52953..bce2100 100644 --- a/media/java/android/media/AudioDevicesManager.java +++ b/media/java/android/media/AudioDevicesManager.java @@ -130,8 +130,7 @@ public class AudioDevicesManager { public ArrayList<AudioDeviceInfo> listDevices(int flags) { Slog.i(TAG, "AudioManager.listDevices(" + Integer.toHexString(flags) + ")"); - //FIXME - Use ArrayList<AudioDevicePort> when mAudioManager.listAudioDevicePorts() is fixed. - ArrayList<AudioPort> ports = new ArrayList<AudioPort>(); + ArrayList<AudioDevicePort> ports = new ArrayList<AudioDevicePort>(); int status = mAudioManager.listAudioDevicePorts(ports); Slog.i(TAG, " status:" + status + " numPorts:" + ports.size()); @@ -140,9 +139,9 @@ public class AudioDevicesManager { if (status == AudioManager.SUCCESS) { deviceList = new ArrayList<AudioDeviceInfo>(); - for (AudioPort port : ports) { - if (/*port instanceof AudioDevicePort &&*/ checkFlags((AudioDevicePort)port, flags)) { - deviceList.add(new AudioDeviceInfo((AudioDevicePort)port)); + for (AudioDevicePort port : ports) { + if (checkFlags(port, flags)) { + deviceList.add(new AudioDeviceInfo(port)); } } } diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index da89cf4..9876995 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3459,14 +3459,14 @@ public class AudioManager { * @see listAudioPorts(ArrayList<AudioPort>) * @hide */ - public int listAudioDevicePorts(ArrayList<AudioPort> devices) { + public int listAudioDevicePorts(ArrayList<AudioDevicePort> devices) { ArrayList<AudioPort> ports = new ArrayList<AudioPort>(); int status = updateAudioPortCache(ports, null); if (status == SUCCESS) { devices.clear(); for (int i = 0; i < ports.size(); i++) { if (ports.get(i) instanceof AudioDevicePort) { - devices.add(ports.get(i)); + devices.add((AudioDevicePort)ports.get(i)); } } } |