Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev

This commit is contained in:
Paul McLean
2015-05-15 14:35:48 +00:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 3 deletions

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

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

View File

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