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

Commit f1482e29 authored by Xin Li's avatar Xin Li
Browse files

Merge Android Pie into master 

Bug: 112104996
Change-Id: I38d5b10220684f653dfb8c7c9a1264eb67bc44fd
parents 9d0f0635 185e46a2

CleanSpec.mk

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.auto 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware.graphics.allocator*)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/seccomp_policy/configstore@1.0.policy)

audio/2.0/config/audio_policy_configuration.xsd

+28 −16
Original line number Diff line number Diff line
@@ -49,10 +49,6 @@ 
            <xs:selector xpath="modules/module"/>

            <xs:field xpath="@name"/>

        </xs:key>

        <xs:key name="devicePortNameGlobalKey">

            <xs:selector xpath="modules/module/devicePorts/devicePort"/>

            <xs:field xpath="@tagName"/>

        </xs:key>

        <xs:unique name="volumeTargetUniqueness">

            <xs:selector xpath="volumes/volume"/>

            <xs:field xpath="@stream"/>
@@ -73,6 +69,8 @@ 
    <!-- Enum values of IDevicesFactory::Device

         TODO: generate from hidl to avoid manual sync. -->

    <xs:simpleType name="halName">

        <xs:union>

            <xs:simpleType>

                <xs:restriction base="xs:string">

                    <xs:enumeration value="primary"/>

                    <xs:enumeration value="a2dp"/>
@@ -82,6 +80,18 @@ 
                    <xs:enumeration value="stub"/>

                </xs:restriction>

            </xs:simpleType>

            <xs:simpleType>

                <!-- Vendor eXtension names must be in the vx namespace.

                     Vendor are encouraged to namespace their module names.

                     Example for an hypothetical Google virtual reality HAL:

                        <module name="vx_google_vr" halVersion="3.0">

                -->

                <xs:restriction base="xs:string">

                    <xs:pattern value="vx_[_a-zA-Z0-9]+"/>

                </xs:restriction>

            </xs:simpleType>

        </xs:union>

    </xs:simpleType>

    <xs:complexType name="modules">

        <xs:annotation>

            <xs:documentation xml:lang="en">
@@ -127,13 +137,15 @@ 
                    <xs:selector xpath="mixPorts/mixPort"/>

                    <xs:field xpath="@name"/>

                </xs:unique>

                <!-- Although this key constraint is redundant with devicePortNameGlobalKey,

                     the set is used to constraint defaultOutputDevice and attachedDevice

                     to reference a devicePort of the same module. -->

                <xs:key name="devicePortNameKey">

                    <xs:selector xpath="devicePorts/devicePort"/>

                    <xs:field xpath="@tagName"/>

                </xs:key>

                <xs:unique name="devicePortUniqueness">

                    <xs:selector xpath="devicePorts/devicePort"/>

                    <xs:field xpath="@type"/>

                    <xs:field xpath="@address"/>

                </xs:unique>

                <xs:keyref name="defaultOutputDeviceRef" refer="devicePortNameKey">

                    <xs:selector xpath="defaultOutputDevice"/>

                    <xs:field xpath="."/>
@@ -405,7 +417,7 @@ 
                    <xs:attribute name="tagName" type="xs:token" use="required"/>

                    <xs:attribute name="type" type="audioDevice" use="required"/>

                    <xs:attribute name="role" type="role" use="required"/>

                    <xs:attribute name="address" type="xs:string" use="optional"/>

                    <xs:attribute name="address" type="xs:string" use="optional" default=""/>

                </xs:complexType>

                <xs:unique name="devicePortProfileUniqueness">

                    <xs:selector xpath="profile"/>

audio/2.0/default/Conversions.cpp

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#include <stdio.h>



#include "Conversions.h"



namespace android {

namespace hardware {

namespace audio {

namespace V2_0 {

namespace implementation {



std::string deviceAddressToHal(const DeviceAddress& address) {

    // HAL assumes that the address is NUL-terminated.

    char halAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];

    memset(halAddress, 0, sizeof(halAddress));

    uint32_t halDevice = static_cast<uint32_t>(address.device);

    const bool isInput = (halDevice & AUDIO_DEVICE_BIT_IN) != 0;

    if (isInput) halDevice &= ~AUDIO_DEVICE_BIT_IN;

    if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_ALL_A2DP) != 0)

            || (isInput && (halDevice & AUDIO_DEVICE_IN_BLUETOOTH_A2DP) != 0)) {

        snprintf(halAddress, sizeof(halAddress),

                "%02X:%02X:%02X:%02X:%02X:%02X",

                address.address.mac[0], address.address.mac[1], address.address.mac[2],

                address.address.mac[3], address.address.mac[4], address.address.mac[5]);

    } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_IP) != 0)

            || (isInput && (halDevice & AUDIO_DEVICE_IN_IP) != 0)) {

        snprintf(halAddress, sizeof(halAddress),

                "%d.%d.%d.%d",

                address.address.ipv4[0], address.address.ipv4[1],

                address.address.ipv4[2], address.address.ipv4[3]);

    } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_ALL_USB) != 0)

            || (isInput && (halDevice & AUDIO_DEVICE_IN_ALL_USB) != 0)) {

        snprintf(halAddress, sizeof(halAddress),

                "card=%d;device=%d",

                address.address.alsa.card, address.address.alsa.device);

    } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_BUS) != 0)

            || (isInput && (halDevice & AUDIO_DEVICE_IN_BUS) != 0)) {

        snprintf(halAddress, sizeof(halAddress),

                "%s", address.busAddress.c_str());

    } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_REMOTE_SUBMIX)) != 0

            || (isInput && (halDevice & AUDIO_DEVICE_IN_REMOTE_SUBMIX) != 0)) {

        snprintf(halAddress, sizeof(halAddress),

                "%s", address.rSubmixAddress.c_str());

    }

    return halAddress;

}



}  // namespace implementation

}  // namespace V2_0

}  // namespace audio

}  // namespace hardware

}  // namespace android

audio/2.0/default/Device.h

deleted100644 → 0
+0 −123
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#ifndef ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H

#define ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H



#include <memory>



#include <media/AudioParameter.h>

#include <hardware/audio.h>



#include <android/hardware/audio/2.0/IDevice.h>

#include <hidl/Status.h>



#include <hidl/MQDescriptor.h>



#include "ParametersUtil.h"



namespace android {

namespace hardware {

namespace audio {

namespace V2_0 {

namespace implementation {



using ::android::hardware::audio::common::V2_0::AudioConfig;

using ::android::hardware::audio::common::V2_0::AudioHwSync;

using ::android::hardware::audio::common::V2_0::AudioInputFlag;

using ::android::hardware::audio::common::V2_0::AudioOutputFlag;

using ::android::hardware::audio::common::V2_0::AudioPatchHandle;

using ::android::hardware::audio::common::V2_0::AudioPort;

using ::android::hardware::audio::common::V2_0::AudioPortConfig;

using ::android::hardware::audio::common::V2_0::AudioSource;

using ::android::hardware::audio::V2_0::DeviceAddress;

using ::android::hardware::audio::V2_0::IDevice;

using ::android::hardware::audio::V2_0::IStreamIn;

using ::android::hardware::audio::V2_0::IStreamOut;

using ::android::hardware::audio::V2_0::ParameterValue;

using ::android::hardware::audio::V2_0::Result;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::hardware::hidl_vec;

using ::android::hardware::hidl_string;

using ::android::sp;



struct Device : public IDevice, public ParametersUtil {

    explicit Device(audio_hw_device_t* device);



    // Methods from ::android::hardware::audio::V2_0::IDevice follow.

    Return<Result> initCheck()  override;

    Return<Result> setMasterVolume(float volume)  override;

    Return<void> getMasterVolume(getMasterVolume_cb _hidl_cb)  override;

    Return<Result> setMicMute(bool mute)  override;

    Return<void> getMicMute(getMicMute_cb _hidl_cb)  override;

    Return<Result> setMasterMute(bool mute)  override;

    Return<void> getMasterMute(getMasterMute_cb _hidl_cb)  override;

    Return<void> getInputBufferSize(

            const AudioConfig& config, getInputBufferSize_cb _hidl_cb)  override;

    Return<void> openOutputStream(

            int32_t ioHandle,

            const DeviceAddress& device,

            const AudioConfig& config,

            AudioOutputFlag flags,

            openOutputStream_cb _hidl_cb)  override;

    Return<void> openInputStream(

            int32_t ioHandle,

            const DeviceAddress& device,

            const AudioConfig& config,

            AudioInputFlag flags,

            AudioSource source,

            openInputStream_cb _hidl_cb)  override;

    Return<bool> supportsAudioPatches()  override;

    Return<void> createAudioPatch(

            const hidl_vec<AudioPortConfig>& sources,

            const hidl_vec<AudioPortConfig>& sinks,

            createAudioPatch_cb _hidl_cb)  override;

    Return<Result> releaseAudioPatch(int32_t patch)  override;

    Return<void> getAudioPort(const AudioPort& port, getAudioPort_cb _hidl_cb)  override;

    Return<Result> setAudioPortConfig(const AudioPortConfig& config)  override;

    Return<AudioHwSync> getHwAvSync()  override;

    Return<Result> setScreenState(bool turnedOn)  override;

    Return<void> getParameters(

            const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb)  override;

    Return<Result> setParameters(const hidl_vec<ParameterValue>& parameters)  override;

    Return<void> debugDump(const hidl_handle& fd)  override;



    // Utility methods for extending interfaces.

    Result analyzeStatus(const char* funcName, int status);

    void closeInputStream(audio_stream_in_t* stream);

    void closeOutputStream(audio_stream_out_t* stream);

    audio_hw_device_t* device() const { return mDevice; }



  private:

    audio_hw_device_t *mDevice;



    virtual ~Device();



    // Methods from ParametersUtil.

    char* halGetParameters(const char* keys) override;

    int halSetParameters(const char* keysAndValues) override;



    uint32_t version() const { return mDevice->common.version; }

};



}  // namespace implementation

}  // namespace V2_0

}  // namespace audio

}  // namespace hardware

}  // namespace android



#endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H

audio/2.0/default/PrimaryDevice.h

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#ifndef ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H

#define ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H



#include <android/hardware/audio/2.0/IPrimaryDevice.h>

#include <hidl/Status.h>



#include <hidl/MQDescriptor.h>



#include "Device.h"



namespace android {

namespace hardware {

namespace audio {

namespace V2_0 {

namespace implementation {



using ::android::hardware::audio::common::V2_0::AudioConfig;

using ::android::hardware::audio::common::V2_0::AudioInputFlag;

using ::android::hardware::audio::common::V2_0::AudioMode;

using ::android::hardware::audio::common::V2_0::AudioOutputFlag;

using ::android::hardware::audio::common::V2_0::AudioPort;

using ::android::hardware::audio::common::V2_0::AudioPortConfig;

using ::android::hardware::audio::common::V2_0::AudioSource;

using ::android::hardware::audio::V2_0::DeviceAddress;

using ::android::hardware::audio::V2_0::IDevice;

using ::android::hardware::audio::V2_0::IPrimaryDevice;

using ::android::hardware::audio::V2_0::IStreamIn;

using ::android::hardware::audio::V2_0::IStreamOut;

using ::android::hardware::audio::V2_0::ParameterValue;

using ::android::hardware::audio::V2_0::Result;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::hardware::hidl_vec;

using ::android::hardware::hidl_string;

using ::android::sp;



struct PrimaryDevice : public IPrimaryDevice {

    explicit PrimaryDevice(audio_hw_device_t* device);



    // Methods from ::android::hardware::audio::V2_0::IDevice follow.

    Return<Result> initCheck()  override;

    Return<Result> setMasterVolume(float volume)  override;

    Return<void> getMasterVolume(getMasterVolume_cb _hidl_cb)  override;

    Return<Result> setMicMute(bool mute)  override;

    Return<void> getMicMute(getMicMute_cb _hidl_cb)  override;

    Return<Result> setMasterMute(bool mute)  override;

    Return<void> getMasterMute(getMasterMute_cb _hidl_cb)  override;

    Return<void> getInputBufferSize(

            const AudioConfig& config, getInputBufferSize_cb _hidl_cb)  override;

    Return<void> openOutputStream(

            int32_t ioHandle,

            const DeviceAddress& device,

            const AudioConfig& config,

            AudioOutputFlag flags,

            openOutputStream_cb _hidl_cb)  override;

    Return<void> openInputStream(

            int32_t ioHandle,

            const DeviceAddress& device,

            const AudioConfig& config,

            AudioInputFlag flags,

            AudioSource source,

            openInputStream_cb _hidl_cb)  override;

    Return<bool> supportsAudioPatches()  override;

    Return<void> createAudioPatch(

            const hidl_vec<AudioPortConfig>& sources,

            const hidl_vec<AudioPortConfig>& sinks,

            createAudioPatch_cb _hidl_cb)  override;

    Return<Result> releaseAudioPatch(int32_t patch)  override;

    Return<void> getAudioPort(const AudioPort& port, getAudioPort_cb _hidl_cb)  override;

    Return<Result> setAudioPortConfig(const AudioPortConfig& config)  override;

    Return<AudioHwSync> getHwAvSync()  override;

    Return<Result> setScreenState(bool turnedOn)  override;

    Return<void> getParameters(

            const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb)  override;

    Return<Result> setParameters(const hidl_vec<ParameterValue>& parameters)  override;

    Return<void> debugDump(const hidl_handle& fd)  override;



    // Methods from ::android::hardware::audio::V2_0::IPrimaryDevice follow.

    Return<Result> setVoiceVolume(float volume)  override;

    Return<Result> setMode(AudioMode mode)  override;

    Return<void> getBtScoNrecEnabled(getBtScoNrecEnabled_cb _hidl_cb)  override;

    Return<Result> setBtScoNrecEnabled(bool enabled)  override;

    Return<void> getBtScoWidebandEnabled(getBtScoWidebandEnabled_cb _hidl_cb)  override;

    Return<Result> setBtScoWidebandEnabled(bool enabled)  override;

    Return<void> getTtyMode(getTtyMode_cb _hidl_cb)  override;

    Return<Result> setTtyMode(IPrimaryDevice::TtyMode mode)  override;

    Return<void> getHacEnabled(getHacEnabled_cb _hidl_cb)  override;

    Return<Result> setHacEnabled(bool enabled)  override;



  private:

    sp<Device> mDevice;



    virtual ~PrimaryDevice();

};



}  // namespace implementation

}  // namespace V2_0

}  // namespace audio

}  // namespace hardware

}  // namespace android



#endif  // ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H