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

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

Merge changes from topic "reland_preferred_input_device" into main 

* changes:
  Reapply "audio policy: improve sharing input logic to prevent tem..."
  Reapply "audio policy: fix preferred input device use in getInput..."
parents 5602660e 0b4bd7aa

media/libaudioclient/aidl/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ cc_defaults { 
    name: "libaudioclient_aidl_fuzzer_defaults",

    static_libs: [

        "android.hardware.audio.common@7.0-enums",

        "libaudiopermission",

        "libaudiomockhal",

        "libaudiopermission",

        "libfakeservicemanager",

        "libjsoncpp",

        "libmediametricsservice",

services/audioflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ cc_defaults { 
        "audio-permission-aidl-cpp",

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "libaudiopermission",

        "av-types-aidl-cpp",

        "com.android.media.audio-aconfig-cc",

        "com.android.media.audioserver-aconfig-cc",
@@ -164,6 +163,7 @@ cc_defaults { 
        "libaudiofoundation",

        "libaudiohal",

        "libaudiomanager",

        "libaudiopermission",

        "libaudioprocessing",

        "libaudioutils",

        "libbinder",

services/audiopolicy/common/managerdefinitions/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ cc_library { 
    export_include_dirs: ["include"],



    cflags: [

        "-DENABLE_CAP_AIDL_HYBRID_MODE",

        "-Wall",

        "-Werror",

        "-DENABLE_CAP_AIDL_HYBRID_MODE",

    ] + select(release_flag("RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"), {

        true: [],

        default: ["-DDISABLE_CAP_AIDL"],

services/audiopolicy/engine/interface/EngineInterface.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ public: 
     */

    virtual sp<DeviceDescriptor> getInputDeviceForAttributes(

            const audio_attributes_t &attr,

            bool ignorePreferredDevice = true,

            uid_t uid = 0,

            audio_session_t session = AUDIO_SESSION_NONE,

            sp<AudioPolicyMix> *mix = nullptr) const = 0;

services/audiopolicy/engineconfigurable/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ cc_library_shared { 
        "src/Stream.cpp",

    ],

    cflags: [

        "-DENABLE_CAP_AIDL_HYBRID_MODE",

        "-Wall",

        "-Werror",

        "-Wextra",

        "-DENABLE_CAP_AIDL_HYBRID_MODE",

    ] + select(release_flag("RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"), {

        true: [],

        default: ["-DDISABLE_CAP_AIDL"],
@@ -46,6 +46,7 @@ cc_library_shared { 
        "libaudiopolicyengineconfigurable_pfwwrapper",

    ],

    shared_libs: [

        "com.android.media.audioserver-aconfig-cc",

        "libaudio_aidl_conversion_common_cpp",

        "libaudiofoundation",

        "libaudiopolicy",