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

Commit 728bf25b authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "[HWAsan Test]fix use-after-free bug" am: 583e8058 am: 8e517718 am:... 

Merge "[HWAsan Test]fix use-after-free bug" am: 583e8058 am: 8e517718 am: f46eccfd am: 588a3547

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2194104



Change-Id: I8fe4a838afd7d93d40e285dd500ae6b44ebe4850
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 956d5c80 588a3547

services/audiopolicy/service/AudioPolicyService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1724,6 +1724,7 @@ void AudioPolicyService::UidPolicy::updateUidLocked(std::unordered_map<uid_t, 
}



bool AudioPolicyService::UidPolicy::isA11yOnTop() {

    Mutex::Autolock _l(mLock);

    for (const auto &uid : mCachedUids) {

        if (!isA11yUid(uid.first)) {

            continue;

services/audiopolicy/service/AudioPolicyService.h

+2 −2
Original line number Diff line number Diff line
@@ -475,8 +475,8 @@ private: 
        Mutex mLock;

        ActivityManager mAm;

        bool mObserverRegistered = false;

        std::unordered_map<uid_t, std::pair<bool, int>> mOverrideUids;

        std::unordered_map<uid_t, std::pair<bool, int>> mCachedUids;

        std::unordered_map<uid_t, std::pair<bool, int>> mOverrideUids GUARDED_BY(mLock);

        std::unordered_map<uid_t, std::pair<bool, int>> mCachedUids GUARDED_BY(mLock);

        std::vector<uid_t> mAssistantUids;

        std::vector<uid_t> mActiveAssistantUids;

        std::vector<uid_t> mA11yUids;