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

Commit c99f182b authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "bluetooth/audio: Apply android.hardware.bluetooth.audio-update-api" into main am: 57f52da3 

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



Change-Id: I772dbc1d4e3646c0ba54009e265d04c24ef88023
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db66183a 57f52da3

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 = 0,

  MPEG4_LC = 1,

  MPEG4_LTP = 2,

  MPEG4_SCALABLE = 3,

  MPEG2_LC,

  MPEG4_LC,

  MPEG4_LTP,

  MPEG4_SCALABLE,

}

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

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ enum AptxAdaptiveChannelMode { 
  MONO = 1,

  DUAL_MONO = 2,

  TWS_STEREO = 4,

  UNKNOWN = 255,

  UNKNOWN = 0xFF,

}

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

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

@Backing(type="int") @VintfStability

enum AptxAdaptiveInputMode {

  STEREO = 0,

  DUAL_MONO = 1,

  STEREO = 0x00,

  DUAL_MONO = 0x01,

}

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

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

@Backing(type="int") @VintfStability

enum AptxMode {

  UNKNOWN = 0,

  HIGH_QUALITY = 4096,

  LOW_LATENCY = 8192,

  ULTRA_LOW_LATENCY = 16384,

  UNKNOWN = 0x00,

  HIGH_QUALITY = 0x1000,

  LOW_LATENCY = 0x2000,

  ULTRA_LOW_LATENCY = 0x4000,

}

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

+2 −2
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ package android.hardware.bluetooth.audio; 
@Backing(type="int") @VintfStability

enum AudioLocation {

  UNKNOWN = 1,

  FRONT_LEFT = 2,

  FRONT_RIGHT = 4,

  FRONT_LEFT = (1 << 1) /* 2 */,

  FRONT_RIGHT = (1 << 2) /* 4 */,

}