summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--media/java/android/media/AudioDeviceInfo.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index fbb65548e34a..941a1405fb2c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14697,7 +14697,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 07fb2d7dc499..1005283a0840 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -15910,7 +15910,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 0384d40651ca..2099bd037548 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();
}