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

Commit 25decd11 authored by Liz Prucka's avatar Liz Prucka Committed by Automerger Merge Worker
Browse files

Merge "Error fix from enabling Clang thread-safety checks." into main am: 6fe6b438 am: dae6e24c 

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



Change-Id: I0bddfbe6d418ee6ae0f3c24f6a38223df9c32697
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2702f6c8 dae6e24c

services/audioflinger/Threads.h

+2 −2
Original line number Diff line number Diff line
@@ -379,10 +379,10 @@ public: 
        return isOutput() ? outDeviceTypes_l() : DeviceTypeSet({inDeviceType_l()});

    }



    const AudioDeviceTypeAddrVector& outDeviceTypeAddrs() const final {

    const AudioDeviceTypeAddrVector& outDeviceTypeAddrs() const final REQUIRES(mutex()) {

        return mOutDeviceTypeAddrs;

    }

    const AudioDeviceTypeAddr& inDeviceTypeAddr() const final {

    const AudioDeviceTypeAddr& inDeviceTypeAddr() const final REQUIRES(mutex()) {

        return mInDeviceTypeAddr;

    }