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

Commit 4101e5bc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8151064 from c1671c38 to tm-d1-release

Change-Id: Iff9061f7cd66f1ea3d014427950b08dc6a8e0712
parents 4c07c46e c1671c38
Loading
Loading
Loading
Loading
+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",
    ],
+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
+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ aidl_interface {
            vndk: {
                enabled: true,
            },
            apex_available: [
                "//apex_available:platform",
                "com.android.bluetooth",
            ],
            min_sdk_version: "31",
        },
    },
    versions: [
+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() {
+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;
Loading