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

Commit 0db6677b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: Remove android.hardware.audio.core.AudioMode type"

parents b5efdb0a 38e85654

audio/aidl/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ aidl_interface { 
        "android.hardware.audio_defaults",

    ],

    srcs: [

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

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

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

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

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

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

@Backing(type="int") @VintfStability

enum AudioMode {

  NORMAL = 0,

  RINGTONE = 1,

  IN_CALL = 2,

  IN_COMMUNICATION = 3,

  CALL_SCREEN = 4,

}

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

+4 −4
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ interface IBluetooth { 
    @nullable @utf8InCpp String debugName;

    @VintfStability

    enum Mode {

      UNSPECIFIED = 0,

      SCO = 1,

      SCO_WB = 2,

      SCO_SWB = 3,

      UNSPECIFIED,

      SCO,

      SCO_WB,

      SCO_SWB,

    }

  }

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

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
@@ -59,7 +59,7 @@ interface IModule { 
  boolean getMicMute();

  void setMicMute(boolean mute);

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

  void updateAudioMode(android.hardware.audio.core.AudioMode mode);

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

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

  void updateScreenState(boolean isTurnedOn);

  @nullable android.hardware.audio.core.sounddose.ISoundDose getSoundDose();

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

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
package android.hardware.audio.core;

@VintfStability

interface ITelephony {

  android.hardware.audio.core.AudioMode[] getSupportedAudioModes();

  void switchAudioMode(android.hardware.audio.core.AudioMode mode);

  android.media.audio.common.AudioMode[] getSupportedAudioModes();

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

  android.hardware.audio.core.ITelephony.TelecomConfig setTelecomConfig(in android.hardware.audio.core.ITelephony.TelecomConfig config);

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

  parcelable TelecomConfig {