Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f6f170a1: am 0c72f4f9: Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev

Browse Source 
* commit 'f6f170a15eb1989171f2043177549a4fbd0f718f':
  Change AudioDevicesInfo.getFormats() to getEncodings().
This commit is contained in:
Paul McLean
2015-05-15 16:38:43 +00:00
committed by Android Git Automerger
parent e4a21719f7 f6f170a15e
commit 9c4531f0f8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();

2
api/system-current.txt
View File

@@ -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();

2
media/java/android/media/AudioDeviceInfo.java
View File

@@ -203,7 +203,7 @@ public final class AudioDeviceInfo {
*
* @see AudioFormat
*/
public @NonNull int[] getFormats() {
public @NonNull int[] getEncodings() {
return mPort.formats();
}