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

Commit 4673d5ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "upstream-hal-v7_1-p3" 

* changes:
  audio: Remove IStreamIn@7.1
  audio: Add IDevice.setConnectedState_7_1 method
  audio: Add recommended mute duration attribute to APM XSD
  Audio: Add memory leak checking for HAL
parents 9e09eec4 4a016add

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

+7 −27
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 {
@@ -56,33 +55,14 @@ interface IDevice extends @7.0::IDevice { 
                    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.

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

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

     * provide extra information such as raw audio descriptors.

     *

     * @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.

     * @param devicePort audio device port.

     * @param connected whether the device is connected.

     * @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);

    setConnectedState_7_1(AudioPort devicePort, bool connected)

            generates (Result retval);

};

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/7.1/config/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ package android.audio.policy.configuration.V7_1 { 
    method @Nullable public String getName();

    method @Nullable public java.util.List<android.audio.policy.configuration.V7_1.AudioUsage> getPreferredUsage();

    method @Nullable public java.util.List<android.audio.policy.configuration.V7_1.Profile> getProfile();

    method @Nullable public long getRecommendedMuteDurationMs();

    method @Nullable public android.audio.policy.configuration.V7_1.Role getRole();

    method public void setFlags(@Nullable java.util.List<android.audio.policy.configuration.V7_1.AudioInOutFlag>);

    method public void setGains(@Nullable android.audio.policy.configuration.V7_1.Gains);
@@ -469,6 +470,7 @@ package android.audio.policy.configuration.V7_1 { 
    method public void setMaxOpenCount(@Nullable long);

    method public void setName(@Nullable String);

    method public void setPreferredUsage(@Nullable java.util.List<android.audio.policy.configuration.V7_1.AudioUsage>);

    method public void setRecommendedMuteDurationMs(@Nullable long);

    method public void setRole(@Nullable android.audio.policy.configuration.V7_1.Role);

  }

audio/7.1/config/audio_policy_configuration.xsd

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ 
                             </xs:documentation>

                        </xs:annotation>

                    </xs:attribute>

                    <xs:attribute name="recommendedMuteDurationMs" type="xs:unsignedInt"/>

                </xs:complexType>

                <xs:unique name="mixPortProfileUniqueness">

                    <xs:selector xpath="profile"/>