diff options
| author | Paul McLean <pmclean@google.com> | 2015-05-15 14:35:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 14:35:50 +0000 |
| commit | 0c72f4f9d04077f2fe96b486b8501303325a54af (patch) | |
| tree | b07cd626d7ce4523e2aa0afb0e28ddd88d90474e | |
| parent | f02fd46d34624b4549565be777deff8328bbdc05 (diff) | |
| parent | f62c7428e78b1559ccc61e2d645c31ce10199c60 (diff) | |
| download | frameworks_base-0c72f4f9d04077f2fe96b486b8501303325a54af.zip frameworks_base-0c72f4f9d04077f2fe96b486b8501303325a54af.tar.gz frameworks_base-0c72f4f9d04077f2fe96b486b8501303325a54af.tar.bz2 | |
Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioDeviceInfo.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 8b65687..27f3eff 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14701,7 +14701,7 @@ package android.media { method public int[] getChannelCounts(); method public int[] getChannelIndexMasks(); method public int[] getChannelMasks(); - method public int[] getFormats(); + method public int[] getEncodings(); method public int getId(); method public java.lang.CharSequence getProductName(); method public int[] getSampleRates(); diff --git a/api/system-current.txt b/api/system-current.txt index 4a10abb..ff42705c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15914,7 +15914,7 @@ package android.media { method public int[] getChannelCounts(); method public int[] getChannelIndexMasks(); method public int[] getChannelMasks(); - method public int[] getFormats(); + method public int[] getEncodings(); method public int getId(); method public java.lang.CharSequence getProductName(); method public int[] getSampleRates(); diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java index 0384d40..2099bd0 100644 --- a/media/java/android/media/AudioDeviceInfo.java +++ b/media/java/android/media/AudioDeviceInfo.java @@ -203,7 +203,7 @@ public final class AudioDeviceInfo { * * @see AudioFormat */ - public @NonNull int[] getFormats() { + public @NonNull int[] getEncodings() { return mPort.formats(); } |