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

Commit fb52e39f authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Automerger Merge Worker
Browse files

Merge "BT: AptxAdaptive LE/LEX codec and AAC ABR AIDL Changes" am: a15a1888...

Merge "BT: AptxAdaptive LE/LEX codec and AAC ABR AIDL Changes" am: a15a1888 am: f64171c3 am: 8161f832 am: d5ad94b9

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



Change-Id: I728aff39aa6462e126120893314933364dfd7d16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04e0df22 d5ad94b9
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -39,4 +39,5 @@ parcelable AacCapabilities {
  android.hardware.bluetooth.audio.ChannelMode[] channelMode;
  android.hardware.bluetooth.audio.ChannelMode[] channelMode;
  boolean variableBitRateSupported;
  boolean variableBitRateSupported;
  byte[] bitsPerSample;
  byte[] bitsPerSample;
  boolean adaptiveBitRateSupported;
}
}
+1 −0
Original line number Original line Diff line number Diff line
@@ -39,4 +39,5 @@ parcelable AacConfiguration {
  android.hardware.bluetooth.audio.ChannelMode channelMode;
  android.hardware.bluetooth.audio.ChannelMode channelMode;
  boolean variableBitRateEnabled;
  boolean variableBitRateEnabled;
  byte bitsPerSample;
  byte bitsPerSample;
  boolean adaptiveBitRateSupported;
}
}
+42 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.bluetooth.audio;
@VintfStability
parcelable AptxAdaptiveLeCapabilities {
  byte[] pcmBitDepth;
  int[] samplingFrequencyHz;
  int[] frameDurationUs;
  int[] octetsPerFrame;
  byte[] blocksPerSdu;
}
+43 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.bluetooth.audio;
@VintfStability
parcelable AptxAdaptiveLeConfiguration {
  byte pcmBitDepth;
  int samplingFrequencyHz;
  int frameDurationUs;
  int octetsPerFrame;
  byte blocksPerSdu;
  int codecMode;
}
+2 −0
Original line number Original line Diff line number Diff line
@@ -44,4 +44,6 @@ enum CodecType {
  VENDOR = 7,
  VENDOR = 7,
  APTX_ADAPTIVE = 8,
  APTX_ADAPTIVE = 8,
  OPUS = 9,
  OPUS = 9,
  APTX_ADAPTIVE_LE = 10,
  APTX_ADAPTIVE_LEX = 11,
}
}
Loading