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

Commit 6653b9e5 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR3 to AOSP main 

Bug: 346855327
Merged-In: Id72d677611dc019a1658f7e6bd0cca345d6af7d6
Change-Id: I14cece665fa428e807e8d303ab8b9a6d779eb997
parents 038cac11 5598cc40

audio/aidl/default/SoundDose.cpp

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ void SoundDose::onNewMelValues(const std::vector<float>& mels, size_t offset, si 
void SoundDose::MelCallback::onNewMelValues(const std::vector<float>& mels, size_t offset,

                                            size_t length,

                                            audio_port_handle_t deviceId

                                            __attribute__((__unused__))) const {

                                            __attribute__((__unused__)),

                                            bool attenuated __attribute__((__unused__))) const {

    mSoundDose.onNewMelValues(mels, offset, length, deviceId);

}

audio/aidl/default/include/core-impl/SoundDose.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class SoundDose final : public BnSoundDose, public StreamDataProcessorInterface 


        // ------------------------------------ MelCallback ----------------------------------------

        void onNewMelValues(const std::vector<float>& mels, size_t offset, size_t length,

                            audio_port_handle_t deviceId) const override;

                            audio_port_handle_t deviceId, bool attenuated) const override;

        void onMomentaryExposure(float currentMel, audio_port_handle_t deviceId) const override;



        SoundDose& mSoundDose;  // must outlive MelCallback, not owning

automotive/audiocontrol/aidl/Android.bp

+8 −1
Original line number Diff line number Diff line
@@ -50,9 +50,16 @@ aidl_interface { 
                "android.media.audio.common.types-V2",

            ],

        },

        {

            version: "4",

            imports: [

                "android.media.audio.common.types-V3",

                "android.hardware.audio.common-V3",

            ],

        },



    ],

    frozen: false,

    frozen: true,



}

automotive/audiocontrol/aidl/aidl_api/android.hardware.automotive.audiocontrol/4/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
ee20ab2e2d0ffb894fc0b2ca33b72796d636793a

automotive/audiocontrol/aidl/aidl_api/android.hardware.automotive.audiocontrol/4/android/hardware/automotive/audiocontrol/AudioFocusChange.aidl

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

 * Copyright (C) 2020 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.automotive.audiocontrol;

@Backing(type="int") @VintfStability

enum AudioFocusChange {

  NONE = 0,

  GAIN = 1,

  GAIN_TRANSIENT = 2,

  GAIN_TRANSIENT_MAY_DUCK = 3,

  GAIN_TRANSIENT_EXCLUSIVE = 4,

  LOSS = ((-1) * GAIN) /* -1 */,

  LOSS_TRANSIENT = ((-1) * GAIN_TRANSIENT) /* -2 */,

  LOSS_TRANSIENT_CAN_DUCK = ((-1) * GAIN_TRANSIENT_MAY_DUCK) /* -3 */,

}