commit f7c14104673750445bd1c2553021fd61aaeb7f2c
author Andy Hung <hunga@google.com> Sat Apr 18 14:54:08 2020 -0700
committer Andy Hung <hunga@google.com> Mon Apr 20 18:07:51 2020 -0700
tree bbdef5be71641b2b894f543a36472f0f581e581a
parent a6127a935639f127db56974851abc2dda360eca2

MediaMetrics: Add thread-safety checking

Test: atest mediametrics_tests
Bug: 70398235
Bug: 149850236
Change-Id: I288ef92e6444785e02043c2629355c229c14e85c

services/mediametrics/AnalyticsActions.h

diff --git a/services/mediametrics/AnalyticsActions.h b/services/mediametrics/AnalyticsActions.h
index 5568c91..0151134 100644
--- a/services/mediametrics/AnalyticsActions.h
+++ b/services/mediametrics/AnalyticsActions.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <android-base/thread_annotations.h>
 #include <media/MediaMetricsItem.h>
 #include <mutex>
 
@@ -144,7 +145,7 @@
     }
 
     mutable std::mutex mLock;
-    std::map<Trigger, Action> mFilters; // GUARDED_BY mLock
+    std::map<Trigger, Action> mFilters GUARDED_BY(mLock);
 };
 
 } // namespace android::mediametrics