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

Commit 3989de9f authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Move Microphone[Dynamic]Info structs from core" am: e1ad6497 

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



Change-Id: I0b59af91fc82baeef8fef30cedf7353954d211ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf72a5fb e1ad6497

audio/aidl/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ aidl_interface { 
        "android/hardware/audio/core/IStreamOut.aidl",

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

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

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

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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ interface IModule { 
  void setMasterVolume(float volume);

  boolean getMicMute();

  void setMicMute(boolean mute);

  android.hardware.audio.core.MicrophoneInfo[] getMicrophones();

  android.media.audio.common.MicrophoneInfo[] getMicrophones();

  void updateAudioMode(android.media.audio.common.AudioMode mode);

  void updateScreenRotation(android.hardware.audio.core.IModule.ScreenRotation rotation);

  void updateScreenState(boolean isTurnedOn);

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.audio.core; 
@VintfStability

interface IStreamIn {

  android.hardware.audio.core.IStreamCommon getStreamCommon();

  android.hardware.audio.core.MicrophoneDynamicInfo[] getActiveMicrophones();

  android.media.audio.common.MicrophoneDynamicInfo[] getActiveMicrophones();

  android.hardware.audio.core.IStreamIn.MicrophoneDirection getMicrophoneDirection();

  void setMicrophoneDirection(android.hardware.audio.core.IStreamIn.MicrophoneDirection direction);

  float getMicrophoneFieldDimension();
@@ -43,7 +43,7 @@ interface IStreamIn { 
  void updateMetadata(in android.hardware.audio.common.SinkMetadata sinkMetadata);

  float[] getHwGain();

  void setHwGain(in float[] channelGains);

  const int MIC_FIELD_DIMENSION_WIDE_ANGLE = (-1);

  const int MIC_FIELD_DIMENSION_WIDE_ANGLE = (-1) /* -1 */;

  const int MIC_FIELD_DIMENSION_NO_ZOOM = 0;

  const int MIC_FIELD_DIMENSION_MAX_ZOOM = 1;

  const int HW_GAIN_MIN = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ interface ITelephony { 
    const int VOICE_VOLUME_MAX = 1;

    @Backing(type="int") @VintfStability

    enum TtyMode {

      UNSPECIFIED = (-1),

      UNSPECIFIED = (-1) /* -1 */,

      OFF = 0,

      FULL = 1,

      HCO = 2,

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

deleted100644 → 0
+0 −45
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;

@JavaDerive(equals=true, toString=true) @VintfStability

parcelable MicrophoneDynamicInfo {

  @utf8InCpp String id;

  android.hardware.audio.core.MicrophoneDynamicInfo.ChannelMapping[] channelMapping;

  @Backing(type="int") @VintfStability

  enum ChannelMapping {

    UNUSED = 0,

    DIRECT = 1,

    PROCESSED = 2,

  }

}