commit 6cc98c611a45cad8f5c93eeb6646480a06299225
author Andy Hung <hunga@google.com> Fri Jun 09 12:37:23 2023 -0700
committer Andy Hung <hunga@google.com> Mon Jun 12 19:12:55 2023 -0700
tree bc9f6d6147ec86ff46307a71a9a987c84610b56b
parent d6699cebbae2824361579095ab6c37ea301c901f

AudioFlinger: Util clang-tidy fixes

Compile with AUDIO_WATCHDOG and TEE_SINK Configuration.h
defines set.

Test: ALLOW_LOCAL_TIDY_TRUE=1 mm -j .
Bug: 286457446
Merged-In: I7a7e67599c55c42ebbf513f3b7736e7831c94741
Change-Id: I7a7e67599c55c42ebbf513f3b7736e7831c94741
(cherry picked from commit 52d599cf8392662c71f5a9662349f13cb412b2e4)

services/audioflinger/afutils/NBAIO_Tee.h

diff --git a/services/audioflinger/afutils/NBAIO_Tee.h b/services/audioflinger/afutils/NBAIO_Tee.h
index 918cca2..17b6175 100644
--- a/services/audioflinger/afutils/NBAIO_Tee.h
+++ b/services/audioflinger/afutils/NBAIO_Tee.h
@@ -216,7 +216,7 @@
             // Note: as mentioned in NBAIO_Tee::set(), don't call set() while write() is
             // ongoing.
             if (enabled) {
-                std::lock_guard<std::mutex> _l(mLock);
+                const std::lock_guard<std::mutex> _l(mLock);
                 mFlags = flags;
                 mFormat = format; // could get this from the Sink.
                 mFrames = frames;
@@ -228,7 +228,7 @@
         }
 
         void setId(const std::string &id) {
-            std::lock_guard<std::mutex> _l(mLock);
+            const std::lock_guard<std::mutex> _l(mLock);
             mId = id;
         }
 
@@ -237,7 +237,7 @@
             std::string suffix;
             NBAIO_SinkSource sinkSource;
             {
-                std::lock_guard<std::mutex> _l(mLock);
+                const std::lock_guard<std::mutex> _l(mLock);
                 suffix = mId + reason;
                 sinkSource = mSinkSource;
             }
@@ -281,13 +281,13 @@
     class RunningTees {
     public:
         void add(const std::shared_ptr<NBAIO_TeeImpl> &tee) {
-            std::lock_guard<std::mutex> _l(mLock);
+            const std::lock_guard<std::mutex> _l(mLock);
             ALOGW_IF(!mTees.emplace(tee).second,
                     "%s: %p already exists in mTees", __func__, tee.get());
         }
 
         void remove(const std::shared_ptr<NBAIO_TeeImpl> &tee) {
-            std::lock_guard<std::mutex> _l(mLock);
+            const std::lock_guard<std::mutex> _l(mLock);
             ALOGW_IF(mTees.erase(tee) != 1,
                     "%s: %p doesn't exist in mTees", __func__, tee.get());
         }
@@ -295,7 +295,7 @@
         void dump(int fd, const std::string &reason) {
             std::vector<std::shared_ptr<NBAIO_TeeImpl>> tees; // safe snapshot of tees
             {
-                std::lock_guard<std::mutex> _l(mLock);
+                const std::lock_guard<std::mutex> _l(mLock);
                 tees.insert(tees.end(), mTees.begin(), mTees.end());
             }
             for (const auto &tee : tees) {
@@ -320,4 +320,6 @@
     const std::shared_ptr<NBAIO_TeeImpl> mTee;
 }; // NBAIO_Tee
 
+} // namespace android
+
 #endif // TEE_SINK