Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454a18d0 authored by Paul McLean's avatar Paul McLean Committed by Android Git Automerger
Browse files

am 9c4531f0: am f6f170a1: am 0c72f4f9: Merge "Change... 

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

* commit '9c4531f0':
  Change AudioDevicesInfo.getFormats() to getEncodings().
parents 3c5a5e4b 9c4531f0

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14703,7 +14703,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();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15916,7 +15916,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();

media/java/android/media/AudioDeviceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public final class AudioDeviceInfo { 
     *

     * @see AudioFormat

     */

    public @NonNull int[] getFormats() {

    public @NonNull int[] getEncodings() {

        return mPort.formats();

    }