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

Commit 26f23259 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge changes I8c3a4dbd,I608ed8d7,I4a70abba,I61fcf6fe,I9ae8dd64, ... 

* changes:
  audiopolicy: engineconfigurable: Get rid of criteria text file
  AudioFlinger: update cache in/out configuration on device port id change
  audiopolicy: engineconfigurable: Forward device connection state to Policy PFW wrapper
  audiopolicy: engineconfigurable: switch to unix socket for PFW debug
  audiopolicy: engineconfigurable: Simplify policy PFW plugin: remove Id from structure
  audiopolicy: engineconfigurable: Migrate to XML criteria and criterion type defintion
  audiopolicy: engineconfigurable: apply coding style
parents 475d0e85 fc078cd2

media/audioserver/audioserver.rc

+3 −0
Original line number Diff line number Diff line
@@ -16,3 +16,6 @@ on property:vts.native_server.on=1 
    stop audioserver

on property:vts.native_server.on=0

    start audioserver



on init

    mkdir /dev/socket/audioserver 0775 audioserver audioserver

services/audioflinger/Threads.cpp

+9 −5
Original line number Diff line number Diff line
@@ -3850,6 +3850,7 @@ status_t AudioFlinger::PlaybackThread::createAudioPatch_l(const struct audio_pat 
        type |= patch->sinks[i].ext.device.type;

    }



    audio_port_handle_t sinkPortId = patch->sinks[0].id;

#ifdef ADD_BATTERY_DATA

    // when changing the audio output device, call addBatteryData to notify

    // the change
@@ -3879,7 +3880,7 @@ status_t AudioFlinger::PlaybackThread::createAudioPatch_l(const struct audio_pat 


    // mPrevOutDevice is the latest device set by createAudioPatch_l(). It is not set when

    // the thread is created so that the first patch creation triggers an ioConfigChanged callback

    bool configChanged = mPrevOutDevice != type;

    bool configChanged = (mPrevOutDevice != type) || (mDeviceId != sinkPortId);

    mOutDevice = type;

    mPatch = *patch;
@@ -3908,6 +3909,7 @@ status_t AudioFlinger::PlaybackThread::createAudioPatch_l(const struct audio_pat 
    }

    if (configChanged) {

        mPrevOutDevice = type;

        mDeviceId = sinkPortId;

        sendIoConfigEvent_l(AUDIO_OUTPUT_CONFIG_CHANGED);

    }

    return status;
@@ -8145,6 +8147,7 @@ status_t AudioFlinger::RecordThread::createAudioPatch_l(const struct audio_patch 


    // store new device and send to effects

    mInDevice = patch->sources[0].ext.device.type;

    audio_port_handle_t deviceId = patch->sources[0].id;

    mPatch = *patch;

    for (size_t i = 0; i < mEffectChains.size(); i++) {

        mEffectChains[i]->setDevice_l(mInDevice);
@@ -8186,9 +8189,10 @@ status_t AudioFlinger::RecordThread::createAudioPatch_l(const struct audio_patch 
        *handle = AUDIO_PATCH_HANDLE_NONE;

    }



    if (mInDevice != mPrevInDevice) {

    if ((mInDevice != mPrevInDevice) || (mDeviceId != deviceId)) {

        sendIoConfigEvent_l(AUDIO_INPUT_CONFIG_CHANGED);

        mPrevInDevice = mInDevice;

        mDeviceId = deviceId;

    }



    return status;
@@ -8285,7 +8289,7 @@ AudioFlinger::MmapThread::MmapThread( 
        audio_devices_t outDevice, audio_devices_t inDevice, bool systemReady)

    : ThreadBase(audioFlinger, id, outDevice, inDevice, MMAP, systemReady),

      mSessionId(AUDIO_SESSION_NONE),

      mDeviceId(AUDIO_PORT_HANDLE_NONE), mPortId(AUDIO_PORT_HANDLE_NONE),

      mPortId(AUDIO_PORT_HANDLE_NONE),

      mHalStream(stream), mHalDevice(hwDev->hwDevice()), mAudioHwDev(hwDev),

      mActiveTracks(&this->mLocalLog),

      mHalVolFloat(-1.0f), // Initialize to illegal value so it always gets set properly later.
@@ -8769,7 +8773,7 @@ status_t AudioFlinger::MmapThread::createAudioPatch_l(const struct audio_patch * 
        *handle = AUDIO_PATCH_HANDLE_NONE;

    }



    if (isOutput() && mPrevOutDevice != mOutDevice) {

    if (isOutput() && (mPrevOutDevice != mOutDevice || mDeviceId != deviceId)) {

        mPrevOutDevice = type;

        sendIoConfigEvent_l(AUDIO_OUTPUT_CONFIG_CHANGED);

        sp<MmapStreamCallback> callback = mCallback.promote();
@@ -8780,7 +8784,7 @@ status_t AudioFlinger::MmapThread::createAudioPatch_l(const struct audio_patch * 
        }

        mDeviceId = deviceId;

    }

    if (!isOutput() && mPrevInDevice != mInDevice) {

    if (!isOutput() && (mPrevInDevice != mInDevice || mDeviceId != deviceId)) {

        mPrevInDevice = type;

        sendIoConfigEvent_l(AUDIO_INPUT_CONFIG_CHANGED);

        sp<MmapStreamCallback> callback = mCallback.promote();

services/audioflinger/Threads.h

+4 −1
Original line number Diff line number Diff line
@@ -485,6 +485,10 @@ protected: 
                audio_devices_t         mPrevOutDevice;   // previous output device

                audio_devices_t         mPrevInDevice;    // previous input device

                struct audio_patch      mPatch;

                /**

                 * @brief mDeviceId  current device port unique identifier

                 */

                audio_port_handle_t     mDeviceId = AUDIO_PORT_HANDLE_NONE;

                audio_source_t          mAudioSource;



                const audio_io_handle_t mId;
@@ -1704,7 +1708,6 @@ class MmapThread : public ThreadBase 


                audio_attributes_t      mAttr;

                audio_session_t         mSessionId;

                audio_port_handle_t     mDeviceId;

                audio_port_handle_t     mPortId;



                wp<MmapStreamCallback>  mCallback;

services/audiopolicy/engineconfigurable/include/AudioPolicyEngineInstance.h

+2 −4
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ 
class AudioPolicyManagerInterface;

class AudioPolicyPluginInterface;



namespace android

{

namespace audio_policy

{

namespace android {

namespace audio_policy {



class Engine;

services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk

+69 −30
Original line number Diff line number Diff line
@@ -7,15 +7,19 @@ 
#

################################################################################################



ifeq (1, 0)



LOCAL_PATH := $(call my-dir)



ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION), 1)



PFW_CORE := external/parameter-framework

BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk

#@TODO: upstream new domain generator

#BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk

PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas

PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)



TOOLS := frameworks/av/services/audiopolicy/engineconfigurable/tools

BUILD_PFW_SETTINGS := $(TOOLS)/build_audio_pfw_settings.mk



##################################################################

# CONFIGURATION FILES

##################################################################
@@ -25,7 +29,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/parameter-framework

LOCAL_SRC_FILES := $(LOCAL_MODULE).in



AUDIO_PATTERN = @TUNING_ALLOWED@
@@ -46,7 +51,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := PolicyClass.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)
@@ -54,12 +60,12 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := PolicySubsystem.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem-CommonTypes.xml \

    PolicySubsystem-Volume.xml \

    libpolicy-subsystem \

    libpolicy-subsystem



LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)
@@ -67,7 +73,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := PolicySubsystem-CommonTypes.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)
@@ -76,15 +83,16 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := parameter-framework.policy

LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_ADDITIONAL_DEPENDENCIES := \

        PolicyClass.xml \

LOCAL_REQUIRED_MODULES := \

    policy_criteria.xml \

    policy_criterion_types.xml \

    PolicySubsystem.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml



ifeq ($(pfw_rebuild_settings),true)

PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml

PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt

PFW_EDD_FILES := \

        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
@@ -100,6 +108,17 @@ PFW_EDD_FILES := \ 
        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \

        $(LOCAL_PATH)/Settings/volumes.pfw



LOCAL_ADDITIONAL_DEPENDENCIES := \

    $(PFW_EDD_FILES)





PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criterion_types.xml

PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criteria.xml



PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml



PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)



include $(BUILD_PFW_SETTINGS)

else

# Use the existing file
@@ -107,19 +126,27 @@ LOCAL_SRC_FILES := Settings/$(LOCAL_MODULE_STEM) 
include $(BUILD_PREBUILT)

endif # pfw_rebuild_settings



endif # ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION), 0)



######### Policy PFW Settings - No Output #########

ifeq (0, 1)



include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.no-output

LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_ADDITIONAL_DEPENDENCIES := \

        PolicyClass.xml \

LOCAL_REQUIRED_MODULES := \

    policy_criteria.xml \

    policy_criterion_types.xml \

    PolicySubsystem.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml



PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml

PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt

PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml

PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criterion_types.xml

PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criteria.xml

PFW_EDD_FILES := \

        $(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \

        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
@@ -128,20 +155,26 @@ PFW_EDD_FILES := \ 
        $(LOCAL_PATH)/Settings/volumes.pfw



include $(BUILD_PFW_SETTINGS)



endif # ifeq (0, 1)

######### Policy PFW Settings - No Input #########

ifeq (0, 1)



include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.no-input

LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_ADDITIONAL_DEPENDENCIES := \

        PolicyClass.xml \

LOCAL_REQUIRED_MODULES := \

    policy_criteria.xml \

    policy_criterion_types.xml \

    PolicySubsystem.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml



PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml

PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt

PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml

PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criterion_types.xml

PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criteria.xml

PFW_EDD_FILES := \

        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \

        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
@@ -160,3 +193,9 @@ PFW_EDD_FILES := \ 
include $(BUILD_PFW_SETTINGS)



endif # ifeq (1, 0)



#######################################################################

# Recursive call sub-folder Android.mk

#######################################################################



include $(call all-makefiles-under,$(LOCAL_PATH))