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

Commit 688975c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I0a18a6d9,I13a83113,I13c9c8d1,I8717acac am: 8fcc79fc 

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



Change-Id: I5353d130b50572cedac135e673b62907f5288fdf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca3a537b 8fcc79fc

audio/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ aidl_interface { 
        "android/hardware/audio/core/AudioRoute.aidl",

        "android/hardware/audio/core/IConfig.aidl",

        "android/hardware/audio/core/IModule.aidl",

        "android/hardware/audio/core/IStreamCallback.aidl",

        "android/hardware/audio/core/IStreamIn.aidl",

        "android/hardware/audio/core/IStreamOut.aidl",

        "android/hardware/audio/core/ITelephony.aidl",

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IModule.aidl

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ interface IModule { 
    android.hardware.audio.common.SourceMetadata sourceMetadata;

    @nullable android.media.audio.common.AudioOffloadInfo offloadInfo;

    long bufferSizeFrames;

    @nullable android.hardware.audio.core.IStreamCallback callback;

  }

  @VintfStability

  parcelable OpenOutputStreamReturn {

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IStreamCallback.aidl

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

 * Copyright (C) 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.audio.core;

@VintfStability

interface IStreamCallback {

  oneway void onTransferReady();

  oneway void onError();

  oneway void onDrainReady();

}

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/ModuleDebug.aidl

+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ package android.hardware.audio.core; 
@JavaDerive(equals=true, toString=true) @VintfStability

parcelable ModuleDebug {

  boolean simulateDeviceConnections;

  int streamTransientStateDelayMs;

}

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/StreamDescriptor.aidl

+14 −4
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ parcelable StreamDescriptor { 
  const int LATENCY_UNKNOWN = -1;

  @FixedSize @VintfStability

  parcelable Position {

    long frames;

    long timeNs;

    long frames = -1;

    long timeNs = -1;

    const long UNKNOWN = -1;

  }

  @Backing(type="int") @VintfStability

  enum State {
@@ -53,14 +54,23 @@ parcelable StreamDescriptor { 
    PAUSED = 4,

    DRAINING = 5,

    DRAIN_PAUSED = 6,

    TRANSFERRING = 7,

    TRANSFER_PAUSED = 8,

    ERROR = 100,

  }

  @Backing(type="byte") @VintfStability

  enum DrainMode {

    DRAIN_UNSPECIFIED = 0,

    DRAIN_ALL = 1,

    DRAIN_EARLY_NOTIFY = 2,

  }

  @FixedSize @VintfStability

  union Command {

    int hal_reserved_exit;

    int halReservedExit;

    android.media.audio.common.Void getStatus;

    android.media.audio.common.Void start;

    int burst;

    android.media.audio.common.Void drain;

    android.hardware.audio.core.StreamDescriptor.DrainMode drain;

    android.media.audio.common.Void standby;

    android.media.audio.common.Void pause;

    android.media.audio.common.Void flush;