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

Commit 5eeb9fe0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "upstream-hal-v7_1-p3" am: 4673d5ab 

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

Change-Id: I55e6af1f9812f1810f74f55498535238fe488ca1
parents 4ae88c53 4673d5ab

audio/7.1/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ hidl_interface { 
        "IDevice.hal",

        "IDevicesFactory.hal",

        "IPrimaryDevice.hal",

        "IStreamIn.hal",

        "IStreamOut.hal",

        "IStreamOutLatencyModeCallback.hal",

    ],

audio/7.1/IDevice.hal

+0 −32
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.hardware.audio.common@7.0; 
import @7.0::AudioInOutFlag;

import @7.0::IDevice;

import @7.0::Result;

import IStreamIn;

import IStreamOut;



interface IDevice extends @7.0::IDevice {
@@ -55,37 +54,6 @@ interface IDevice extends @7.0::IDevice { 
                    IStreamOut outStream,

                    AudioConfig suggestedConfig);



    /**

     * This method creates and opens the audio hardware input stream.

     * If the stream can not be opened with the proposed audio config,

     * HAL must provide suggested values for the audio config.

     *

     * Note: INVALID_ARGUMENTS is returned both in the case when the

     * HAL can not use the provided config and in the case when

     * the value of any argument is invalid. In the latter case the

     * HAL must provide a default initialized suggested config.

     *

     * @param ioHandle handle assigned by AudioFlinger.

     * @param device device type and (if needed) address.

     * @param config stream configuration.

     * @param flags additional flags.

     * @param sinkMetadata Description of the audio that is suggested by the client.

     *                     May be used by implementations to configure processing effects.

     * @return retval operation completion status.

     * @return inStream in case of success, created input stream.

     * @return suggestedConfig in the case of rejection of the proposed config,

     *                         a config suggested by the HAL.

     */

    openInputStream_7_1(

            AudioIoHandle ioHandle,

            DeviceAddress device,

            AudioConfig config,

            vec<AudioInOutFlag> flags,

            SinkMetadata sinkMetadata) generates (

                    Result retval,

                    IStreamIn inStream,

                    AudioConfig suggestedConfig);



    /**

     * Notifies the device module about the connection state of an input/output

     * device attached to it. The devicePort identifies the device and may also

audio/7.1/IStreamIn.hal

deleted100644 → 0
+0 −22
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.

 */



package android.hardware.audio@7.1;



import @7.0::IStreamIn;



interface IStreamIn extends @7.0::IStreamIn {

};

audio/core/all-versions/default/Device.cpp

+0 −10
Original line number Diff line number Diff line
@@ -348,16 +348,6 @@ Return<void> Device::openOutputStream_7_1(int32_t ioHandle, const DeviceAddress& 
    _hidl_cb(result, streamOut, suggestedConfig);

    return Void();

}



Return<void> Device::openInputStream_7_1(int32_t ioHandle, const DeviceAddress& device,

                                         const AudioConfig& config, const AudioInputFlags& flags,

                                         const SinkMetadata& sinkMetadata,

                                         openInputStream_7_1_cb _hidl_cb) {

    auto [result, streamIn, suggestedConfig] =

            openInputStreamImpl(ioHandle, device, config, flags, sinkMetadata);

    _hidl_cb(result, streamIn, suggestedConfig);

    return Void();

}

#endif  // V7.1



Return<bool> Device::supportsAudioPatches() {

audio/core/all-versions/default/include/core/default/Device.h

+0 −4
Original line number Diff line number Diff line
@@ -123,10 +123,6 @@ struct Device : public IDevice, public ParametersUtil { 
                                      const AudioConfig& config, const AudioOutputFlags& flags,

                                      const SourceMetadata& sourceMetadata,

                                      openOutputStream_7_1_cb _hidl_cb) override;

    Return<void> openInputStream_7_1(int32_t ioHandle, const DeviceAddress& device,

                                     const AudioConfig& config, const AudioInputFlags& flags,

                                     const SinkMetadata& sinkMetadata,

                                     openInputStream_7_1_cb _hidl_cb) override;

#endif



    Return<bool> supportsAudioPatches() override;