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

Commit 50768af5 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge \"Make Dolby TrueHD audio format public\" into nyc-mr1-dev 

am: eb8de292

Change-Id: I2cfe7a072d7bdbce4a1fad357b1608c1f9624688
parents c2381727 eb8de292

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19652,6 +19652,7 @@ package android.media { 
    field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;

    field public static final int ENCODING_AC3 = 5; // 0x5

    field public static final int ENCODING_DEFAULT = 1; // 0x1

    field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe

    field public static final int ENCODING_DTS = 7; // 0x7

    field public static final int ENCODING_DTS_HD = 8; // 0x8

    field public static final int ENCODING_E_AC3 = 6; // 0x6

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21160,6 +21160,7 @@ package android.media { 
    field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;

    field public static final int ENCODING_AC3 = 5; // 0x5

    field public static final int ENCODING_DEFAULT = 1; // 0x1

    field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe

    field public static final int ENCODING_DTS = 7; // 0x7

    field public static final int ENCODING_DTS_HD = 8; // 0x8

    field public static final int ENCODING_E_AC3 = 6; // 0x6

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19722,6 +19722,7 @@ package android.media { 
    field public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;

    field public static final int ENCODING_AC3 = 5; // 0x5

    field public static final int ENCODING_DEFAULT = 1; // 0x1

    field public static final int ENCODING_DOLBY_TRUEHD = 14; // 0xe

    field public static final int ENCODING_DTS = 7; // 0x7

    field public static final int ENCODING_DTS_HD = 8; // 0x8

    field public static final int ENCODING_E_AC3 = 6; // 0x6

media/java/android/media/AudioFormat.java

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ public final class AudioFormat implements Parcelable { 
     */

    public static final int ENCODING_IEC61937 = 13;

    /** Audio data format: DOLBY TRUEHD compressed

     * @hide

     **/

    public static final int ENCODING_DOLBY_TRUEHD = 14;