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

Commit b9d3ede9 authored by ELIYAZ MOMIN (xWF)'s avatar ELIYAZ MOMIN (xWF) Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "revert-31539765-cherrypicker-L70300030009242895:N43100030156877762-NMVLCHWFOO" into main

* changes:
  Revert "audio policy: fix preferred input device use in getInput..."
  Revert "audio policy: improve sharing input logic to prevent tem..."
parents 43460851 22ebe5f9

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",

        "libaudiomockhal",

        "libaudiopermission",

        "libaudiomockhal",

        "libfakeservicemanager",

        "libjsoncpp",

        "libmediametricsservice",

services/audioflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ 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",
@@ -163,7 +164,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ 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

+1 −2
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,7 +46,6 @@ cc_library_shared { 
        "libaudiopolicyengineconfigurable_pfwwrapper",

    ],

    shared_libs: [

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

        "libaudio_aidl_conversion_common_cpp",

        "libaudiofoundation",

        "libaudiopolicy",