diff options
| author | Paul McLean <pmclean@google.com> | 2015-08-06 09:35:55 -0600 |
|---|---|---|
| committer | Paul McLean <pmclean@google.com> | 2015-08-06 10:03:13 -0600 |
| commit | 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523 (patch) | |
| tree | 27a9dc6ff1cf694b79fcbeeeaa627a4b1b10c562 /media/java | |
| parent | 66845a36c9eeca5296a2bf86793a5d6bedac1b36 (diff) | |
| download | frameworks_base-8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.zip frameworks_base-8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.tar.gz frameworks_base-8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.tar.bz2 | |
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioDeviceInfo.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java index bdb1f58..d502b4a 100644 --- a/media/java/android/media/AudioDeviceInfo.java +++ b/media/java/android/media/AudioDeviceInfo.java @@ -109,6 +109,14 @@ public final class AudioDeviceInfo { * A device type connected over IP. */ public static final int TYPE_IP = 20; + /** + * @hide + * A remote-submix device. + * We need this for CTS, but it is not part of the external API. + * FIXME It has been suggested that CTS should only be testing public APIs. + * Consider this for a public API. + */ + public static final int TYPE_REMOTE_SUBMIX = 0x7FFF; private final AudioDevicePort mPort; @@ -255,6 +263,7 @@ public final class AudioDeviceInfo { INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_FM, TYPE_FM); INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_AUX_LINE, TYPE_AUX_LINE); INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_IP, TYPE_IP); + INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_REMOTE_SUBMIX, TYPE_REMOTE_SUBMIX); INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BUILTIN_MIC, TYPE_BUILTIN_MIC); INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BLUETOOTH_SCO_HEADSET, TYPE_BLUETOOTH_SCO); @@ -272,10 +281,7 @@ public final class AudioDeviceInfo { INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_SPDIF, TYPE_LINE_DIGITAL); INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BLUETOOTH_A2DP, TYPE_BLUETOOTH_A2DP); INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_IP, TYPE_IP); - - // not covered here, legacy - //AudioSystem.DEVICE_OUT_REMOTE_SUBMIX - //AudioSystem.DEVICE_IN_REMOTE_SUBMIX + INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_REMOTE_SUBMIX, TYPE_REMOTE_SUBMIX); // privileges mapping to output device EXT_TO_INT_DEVICE_MAPPING = new SparseIntArray(); |