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

Commit 576da541 authored by Antoine Soulier's avatar Antoine Soulier Committed by Automerger Merge Worker
Browse files

Merge changes I3f440a75,I5566a1ef into main am: 9820d5d5 am: 33e767ff 

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



Change-Id: I61c8e311586dbeb6a395ca3db18a08895aaae4f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e3bc609 33e767ff

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

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 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 AudioContext {

  int bitmask;

  const int UNSPECIFIED = 0x0001;

  const int CONVERSATIONAL = 0x0002;

  const int MEDIA = 0x0004;

  const int GAME = 0x0008;

  const int INSTRUCTIONAL = 0x0010;

  const int VOICE_ASSISTANTS = 0x0020;

  const int LIVE_AUDIO = 0x0040;

  const int SOUND_EFFECTS = 0x0080;

  const int NOTIFICATIONS = 0x0100;

  const int RINGTONE_ALERTS = 0x0200;

  const int ALERTS = 0x0400;

  const int EMERGENCY_ALARM = 0x0800;

}

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 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

union CodecId {

  android.hardware.bluetooth.audio.CodecId.A2dp a2dp = android.hardware.bluetooth.audio.CodecId.A2dp.SBC;

  android.hardware.bluetooth.audio.CodecId.Core core;

  android.hardware.bluetooth.audio.CodecId.Vendor vendor;

  enum A2dp {

    SBC = 0,

    AAC = 2,

  }

  enum Core {

    CVSD = 2,

    MSBC = 5,

    LC3 = 6,

  }

  parcelable Vendor {

    int id;

    int codecId;

  }

}

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 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 CodecInfo {

  android.hardware.bluetooth.audio.CodecId id;

  String name;

  android.hardware.bluetooth.audio.CodecInfo.Transport transport;

  parcelable A2dp {

    byte[] capabilities;

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

    int[] samplingFrequencyHz;

    int[] bitdepth;

    boolean lossless;

  }

  parcelable Hfp {

    int inputDataPath = 1;

    int outputDataPath = 1;

    boolean useControllerCodec = true;

  }

  union Transport {

    android.hardware.bluetooth.audio.CodecInfo.A2dp a2dp;

    android.hardware.bluetooth.audio.CodecInfo.Hfp hfp;

  }

}

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

+6 −0
Original line number Diff line number Diff line
@@ -36,4 +36,10 @@ package android.hardware.bluetooth.audio; 
interface IBluetoothAudioProviderFactory {

  android.hardware.bluetooth.audio.AudioCapabilities[] getProviderCapabilities(in android.hardware.bluetooth.audio.SessionType sessionType);

  android.hardware.bluetooth.audio.IBluetoothAudioProvider openProvider(in android.hardware.bluetooth.audio.SessionType sessionType);

  @nullable android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory.ProviderInfo getProviderInfo(in android.hardware.bluetooth.audio.SessionType sessionType);

  @VintfStability

  parcelable ProviderInfo {

    String name;

    android.hardware.bluetooth.audio.CodecInfo[] codecInfos;

  }

}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/AudioContext.aidl

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 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.

 */



package android.hardware.bluetooth.audio;



/**

 * Context of the audio configuration.

 * Defined by PACS (Le Audio) and used either by A2DP or LE Audio.

 * The `bitmask` is any combination of BT Sig standardized values

 * [Assigned Numbers - 6.12.3], defined in this scope.

 */

@VintfStability

parcelable AudioContext {

    const int UNSPECIFIED = 0x0001;

    const int CONVERSATIONAL = 0x0002;

    const int MEDIA = 0x0004;

    const int GAME = 0x0008;

    const int INSTRUCTIONAL = 0x0010;

    const int VOICE_ASSISTANTS = 0x0020;

    const int LIVE_AUDIO = 0x0040;

    const int SOUND_EFFECTS = 0x0080;

    const int NOTIFICATIONS = 0x0100;

    const int RINGTONE_ALERTS = 0x0200;

    const int ALERTS = 0x0400;

    const int EMERGENCY_ALARM = 0x0800;



    int bitmask;

}