commit d4532c8e1383eb02baca1013e0c12bef7a3cfdcb
author Shunkai Yao <yaoshunkai@google.com> Sun Dec 17 20:01:45 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Tue Dec 19 01:56:31 2023 +0000
tree 90b3a0df8846e575f3e3fdc2cde8fa9750ac7e1d
parent 8203615cd0f23545b5e7f0b1b9d24d62b4127063

Recognize AIDL calls in TimeCheck

Bug: 309542478
Test: simulate timeout of HAL implementation
Test: dumpsys media.audio_flinger
Change-Id: I5de2c3d280acb1970af2a68f6bdd8270e1d41eb3

media/utils/MethodStatistics.cpp

diff --git a/media/utils/MethodStatistics.cpp b/media/utils/MethodStatistics.cpp
index 086757b..80f0fc4 100644
--- a/media/utils/MethodStatistics.cpp
+++ b/media/utils/MethodStatistics.cpp
@@ -20,6 +20,8 @@
 
 // Repository for MethodStatistics Objects
 
+// It's important to have the HAL class name defined with suffix "Hidl/Aidl" because
+// TimerThread::isRequestFromHal use this string to match binder call to/from hal.
 std::shared_ptr<std::vector<std::string>>
 getStatisticsClassesForModule(std::string_view moduleName) {
     static const std::map<std::string, std::shared_ptr<std::vector<std::string>>,
@@ -34,6 +36,15 @@
                 "StreamOutHalHidl",
               })
         },
+        {
+            METHOD_STATISTICS_MODULE_NAME_AUDIO_AIDL,
+            std::shared_ptr<std::vector<std::string>>(
+                new std::vector<std::string>{
+                "DeviceHalAidl",
+                "EffectHalAidl",
+                "StreamHalAidl",
+              })
+        },
     };
     auto it = m.find(moduleName);
     if (it == m.end()) return {};
@@ -61,6 +72,9 @@
             addClassesToMap(
                     getStatisticsClassesForModule(METHOD_STATISTICS_MODULE_NAME_AUDIO_HIDL),
                     m);
+            addClassesToMap(
+                    getStatisticsClassesForModule(METHOD_STATISTICS_MODULE_NAME_AUDIO_AIDL),
+                    m);
             return m;
         }();