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

Commit 8260f56b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BtAudio: Replace bitmask capabilities with vector" am: 3ee0b2d0 am:... 

Merge "BtAudio: Replace bitmask capabilities with vector" am: 3ee0b2d0 am: c81712e4 am: 299a3c68

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1946788

Change-Id: Ib8f1ef500604b581c7a12188316a9fd4c7434236
parents 8a67a1fc 299a3c68

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/AacCapabilities.aidl

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
package android.hardware.bluetooth.audio;

@VintfStability

parcelable AacCapabilities {

  android.hardware.bluetooth.audio.AacObjectType objectType;

  android.hardware.bluetooth.audio.AacObjectType[] objectType;

  int[] sampleRateHz;

  android.hardware.bluetooth.audio.ChannelMode channelMode;

  android.hardware.bluetooth.audio.ChannelMode[] channelMode;

  boolean variableBitRateSupported;

  byte[] bitsPerSample;

}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/AacObjectType.aidl

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
package android.hardware.bluetooth.audio;

@Backing(type="byte") @VintfStability

enum AacObjectType {

  MPEG2_LC = 1,

  MPEG4_LC = 2,

  MPEG4_LTP = 4,

  MPEG4_SCALABLE = 8,

  MPEG2_LC = 0,

  MPEG4_LC = 1,

  MPEG4_LTP = 2,

  MPEG4_SCALABLE = 3,

}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/AptxCapabilities.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ package android.hardware.bluetooth.audio; 
@VintfStability

parcelable AptxCapabilities {

  int[] sampleRateHz;

  android.hardware.bluetooth.audio.ChannelMode channelMode;

  android.hardware.bluetooth.audio.ChannelMode[] channelMode;

  byte[] bitsPerSample;

}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/ChannelMode.aidl

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.bluetooth.audio;

@Backing(type="byte") @VintfStability

enum ChannelMode {

  UNKNOWN = 1,

  MONO = 2,

  STEREO = 4,

  UNKNOWN = 0,

  MONO = 1,

  STEREO = 2,

}

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LdacCapabilities.aidl

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.bluetooth.audio; 
@VintfStability

parcelable LdacCapabilities {

  int[] sampleRateHz;

  android.hardware.bluetooth.audio.LdacChannelMode channelMode;

  android.hardware.bluetooth.audio.LdacQualityIndex qualityIndex;

  android.hardware.bluetooth.audio.LdacChannelMode[] channelMode;

  android.hardware.bluetooth.audio.LdacQualityIndex[] qualityIndex;

  byte[] bitsPerSample;

}