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

Commit fa7c0274 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Make android.media.AudioFormat parcelable" into nyc-dev 

am: a572e4a8

* commit 'a572e4a8':
  Make android.media.AudioFormat parcelable
parents ebe80b5f a572e4a8

api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -19712,12 +19712,14 @@ package android.media { 
    field public static final int TYPE_WIRED_HEADSET = 3; // 0x3

  }













  public class AudioFormat {













  public class AudioFormat implements android.os.Parcelable {













    method public int describeContents();















    method public int getChannelCount();















    method public int getChannelIndexMask();















    method public int getChannelMask();















    method public int getEncoding();















    method public int getSampleRate();













    method public void writeToParcel(android.os.Parcel, int);















    field public static final deprecated int CHANNEL_CONFIGURATION_DEFAULT = 1; // 0x1















    field public static final deprecated int CHANNEL_CONFIGURATION_INVALID = 0; // 0x0















    field public static final deprecated int CHANNEL_CONFIGURATION_MONO = 2; // 0x2










@@ -19759,6 +19761,7 @@ package android.media {













    field public static final int CHANNEL_OUT_SIDE_RIGHT = 4096; // 0x1000















    field public static final int CHANNEL_OUT_STEREO = 12; // 0xc















    field public static final int CHANNEL_OUT_SURROUND = 1052; // 0x41c













    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_DTS = 7; // 0x7

























api/removed.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -35,7 +35,7 @@ package android.database {





























package android.media {





























  public class AudioFormat {













  public class AudioFormat implements android.os.Parcelable {















    ctor public AudioFormat();















  }

















































api/system-current.txt



+4
−1




























Original line number
Diff line number
Diff line








@@ -21208,12 +21208,14 @@ package android.media {













    field public static final android.os.Parcelable.Creator<android.media.AudioFocusInfo> CREATOR;















  }



























  public class AudioFormat {













  public class AudioFormat implements android.os.Parcelable {













    method public int describeContents();















    method public int getChannelCount();















    method public int getChannelIndexMask();















    method public int getChannelMask();















    method public int getEncoding();















    method public int getSampleRate();













    method public void writeToParcel(android.os.Parcel, int);















    field public static final deprecated int CHANNEL_CONFIGURATION_DEFAULT = 1; // 0x1















    field public static final deprecated int CHANNEL_CONFIGURATION_INVALID = 0; // 0x0















    field public static final deprecated int CHANNEL_CONFIGURATION_MONO = 2; // 0x2










@@ -21255,6 +21257,7 @@ package android.media {













    field public static final int CHANNEL_OUT_SIDE_RIGHT = 4096; // 0x1000















    field public static final int CHANNEL_OUT_STEREO = 12; // 0xc















    field public static final int CHANNEL_OUT_SURROUND = 1052; // 0x41c













    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_DTS = 7; // 0x7

























api/system-removed.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -26,7 +26,7 @@ package android.database {





























package android.media {





























  public class AudioFormat {













  public class AudioFormat implements android.os.Parcelable {















    ctor public AudioFormat();















  }

















































api/test-current.txt



+4
−1




























Original line number
Diff line number
Diff line








@@ -19721,12 +19721,14 @@ package android.media {













    field public static final int TYPE_WIRED_HEADSET = 3; // 0x3















  }



























  public class AudioFormat {













  public class AudioFormat implements android.os.Parcelable {













    method public int describeContents();















    method public int getChannelCount();















    method public int getChannelIndexMask();















    method public int getChannelMask();















    method public int getEncoding();















    method public int getSampleRate();













    method public void writeToParcel(android.os.Parcel, int);















    field public static final deprecated int CHANNEL_CONFIGURATION_DEFAULT = 1; // 0x1















    field public static final deprecated int CHANNEL_CONFIGURATION_INVALID = 0; // 0x0















    field public static final deprecated int CHANNEL_CONFIGURATION_MONO = 2; // 0x2










@@ -19768,6 +19770,7 @@ package android.media {













    field public static final int CHANNEL_OUT_SIDE_RIGHT = 4096; // 0x1000















    field public static final int CHANNEL_OUT_STEREO = 12; // 0xc















    field public static final int CHANNEL_OUT_SURROUND = 1052; // 0x41c













    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_DTS = 7; // 0x7