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

Commit 70e6e0f8 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5649060 from c7aedb38 to qt-qpr1-release 

Change-Id: Idc886a493b61e3a4dc8432d20c7464894492b0a1
parents 3985aea2 c7aedb38

apex/ld.config.txt

+3 −1
Original line number Diff line number Diff line
@@ -38,8 +38,10 @@ namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv 
namespace.platform.isolated = true



namespace.platform.search.paths  = /system/${LIB}

namespace.platform.search.paths += /apex/com.android.runtime/${LIB}

namespace.platform.asan.search.paths  = /data/asan/system/${LIB}

namespace.platform.asan.search.paths +=           /system/${LIB}

namespace.platform.asan.search.paths += /apex/com.android.runtime/${LIB}



# /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc.

# Add /apex/... pat to the permitted paths because linker uses realpath(3)

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

+3 −2
Original line number Diff line number Diff line
@@ -120,8 +120,9 @@ status_t AudioPolicyMixCollection::getAudioPolicyMix(audio_devices_t deviceType, 


    ALOGV("getAudioPolicyMix() for dev=0x%x addr=%s", deviceType, address.string());

    for (ssize_t i = 0; i < size(); i++) {

        if (itemAt(i)->mDeviceType == deviceType

                && itemAt(i)->mDeviceAddress.compare(address) == 0) {

        // Workaround: when an in audio policy is registered, it opens an output

        // that tries to find the audio policy, thus the device must be ignored.

        if (itemAt(i)->mDeviceAddress.compare(address) == 0) {

            policyMix = itemAt(i);

            ALOGV("getAudioPolicyMix: found mix %zu match (devType=0x%x addr=%s)",

                    i, deviceType, address.string());