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

Commit bab329e3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9675941 from 95342882 to udc-release

Change-Id: I8738f0f71f144a2b5fcd925ca3d1b85117a9b7ae
parents 87128fc9 95342882
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -36,12 +36,13 @@ aidl_interface {
        "android.hardware.audio_defaults",
    ],
    srcs: [
        "android/hardware/audio/common/AudioOffloadMetadata.aidl",
        "android/hardware/audio/common/PlaybackTrackMetadata.aidl",
        "android/hardware/audio/common/RecordTrackMetadata.aidl",
        "android/hardware/audio/common/SinkMetadata.aidl",
        "android/hardware/audio/common/SourceMetadata.aidl",
    ],
    frozen: true,
    frozen: false,
    imports: [
        "android.media.audio.common.types-V2",
    ],
@@ -77,7 +78,7 @@ aidl_interface {
}

// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_audio_common = "android.hardware.audio.common-V1"
latest_android_hardware_audio_common = "android.hardware.audio.common-V2"

// Modules that depend on android.hardware.audio.common directly can include
// the following cc_defaults to avoid explicitly managing dependency versions
@@ -112,6 +113,7 @@ aidl_interface {
        "android/hardware/audio/core/AudioPatch.aidl",
        "android/hardware/audio/core/AudioRoute.aidl",
        "android/hardware/audio/core/IBluetooth.aidl",
        "android/hardware/audio/core/IBluetoothA2dp.aidl",
        "android/hardware/audio/core/IConfig.aidl",
        "android/hardware/audio/core/IModule.aidl",
        "android/hardware/audio/core/IStreamCallback.aidl",
@@ -129,7 +131,7 @@ aidl_interface {
    imports: [
        "android.hardware.common-V2",
        "android.hardware.common.fmq-V1",
        "android.hardware.audio.common-V1",
        "android.hardware.audio.common-V2",
        "android.hardware.audio.core.sounddose-V1",
        "android.hardware.audio.effect-V1",
        "android.media.audio.common.types-V2",
@@ -253,7 +255,7 @@ aidl_interface {
    imports: [
        "android.hardware.common-V2",
        "android.hardware.common.fmq-V1",
        "android.hardware.audio.common-V1",
        "android.hardware.audio.common-V2",
        "android.media.audio.common.types-V2",
    ],
    backend: {
+10 −7
Original line number Diff line number Diff line
/*
 * Copyright 2021, The Android Open Source Project
 * Copyright (C) 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.
@@ -31,9 +31,12 @@
// 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.security.dice;
/* @hide */
@RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability
parcelable Config {
  byte[] desc;
package android.hardware.audio.common;
@JavaDerive(equals=true, toString=true) @VintfStability
parcelable AudioOffloadMetadata {
  int sampleRate;
  android.media.audio.common.AudioChannelLayout channelMask;
  int averageBitRatePerSecond;
  int delayFrames;
  int paddingFrames;
}
+7 −4
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 The Android Open Source Project
 * Copyright (C) 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.
@@ -31,8 +31,11 @@
// 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.wifi;
package android.hardware.audio.core;
@VintfStability
parcelable WifiRadioCombinationMatrix {
  android.hardware.wifi.WifiRadioCombination[] radioCombinations;
interface IBluetoothA2dp {
  boolean isEnabled();
  void setEnabled(boolean enabled);
  boolean supportsOffloadReconfiguration();
  void reconfigureOffload(in android.hardware.audio.core.VendorParameter[] parameters);
}
+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ interface IModule {
  void setModuleDebug(in android.hardware.audio.core.ModuleDebug debug);
  @nullable android.hardware.audio.core.ITelephony getTelephony();
  @nullable android.hardware.audio.core.IBluetooth getBluetooth();
  @nullable android.hardware.audio.core.IBluetoothA2dp getBluetoothA2dp();
  android.media.audio.common.AudioPort connectExternalDevice(in android.media.audio.common.AudioPort templateIdAndAdditionalData);
  void disconnectExternalDevice(int portId);
  android.hardware.audio.core.AudioPatch[] getAudioPatches();
+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ package android.hardware.audio.core;
interface IStreamOut {
  android.hardware.audio.core.IStreamCommon getStreamCommon();
  void updateMetadata(in android.hardware.audio.common.SourceMetadata sourceMetadata);
  void updateOffloadMetadata(in android.hardware.audio.common.AudioOffloadMetadata offloadMetadata);
  float[] getHwVolume();
  void setHwVolume(in float[] channelVolumes);
  float getAudioDescriptionMixLevel();
Loading