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

Commit 3b3598d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move RunningTees singleton to cpp file." into main am: 9a072183 

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



Change-Id: Ie1c8635995b8cf43fc5253c96a879706701a66af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e26cd724 9a072183

services/audioflinger/afutils/NBAIO_Tee.cpp

+6 −0
Original line number Diff line number Diff line
@@ -514,6 +514,12 @@ status_t AudioFileHandler::createInternal( 
    return NO_ERROR; // return full path

}



/* static */

NBAIO_Tee::RunningTees& NBAIO_Tee::getRunningTees() {

    [[clang::no_destroy]] static RunningTees runningTees;

    return runningTees;

}



} // namespace android



#endif // TEE_SINK

services/audioflinger/afutils/NBAIO_Tee.h

+1 −4
Original line number Diff line number Diff line
@@ -310,10 +310,7 @@ private: 
    };



    // singleton

    static RunningTees &getRunningTees() {

        static RunningTees runningTees;

        return runningTees;

    }

    static RunningTees& getRunningTees();



    // The NBAIO TeeImpl may have lifetime longer than NBAIO_Tee if

    // RunningTees::dump() is being called simultaneous to ~NBAIO_Tee().