commit 3b3598d4e6a34b6ea408426013130782216e9c12
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 13 18:30:28 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 13 18:30:28 2024 +0000
tree 0ba2f5f13d8de20f2aa30f8982ed21426d103ff4
parent e26cd724739d43c03f46fce4f2c019941663d2a3
parent 9a07218338937e2ce357db2e767c62ac10f4990c

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

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

Change-Id: Ie1c8635995b8cf43fc5253c96a879706701a66af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/audioflinger/afutils/NBAIO_Tee.cpp

diff --git a/services/audioflinger/afutils/NBAIO_Tee.cpp b/services/audioflinger/afutils/NBAIO_Tee.cpp
index 86fb128..cdc8e95 100644
--- a/services/audioflinger/afutils/NBAIO_Tee.cpp
+++ b/services/audioflinger/afutils/NBAIO_Tee.cpp
@@ -514,6 +514,12 @@
     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

diff --git a/services/audioflinger/afutils/NBAIO_Tee.h b/services/audioflinger/afutils/NBAIO_Tee.h
index a5c544e..5ab1949 100644
--- a/services/audioflinger/afutils/NBAIO_Tee.h
+++ b/services/audioflinger/afutils/NBAIO_Tee.h
@@ -310,10 +310,7 @@
     };
 
     // 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().