MediaUtils: Create singleton UidInfo
A singleton optimizes for multiple calling sites, and
the info is contained in a shared pointer to avoid copying.
Test: adb shell dumpsys media.audio_flinger / media.metrics
Bug: 350114693
Flag: EXEMPT bugfix
Change-Id: I5578e49e61145812ea0378752cea485cbb5b57d8
diff --git a/media/utils/include/mediautils/ServiceUtilities.h b/media/utils/include/mediautils/ServiceUtilities.h
index e0fabfd..b365648 100644
--- a/media/utils/include/mediautils/ServiceUtilities.h
+++ b/media/utils/include/mediautils/ServiceUtilities.h
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <android/content/pm/IPackageManagerNative.h>
+#include <android-base/thread_annotations.h>
#include <binder/IMemory.h>
#include <binder/PermissionController.h>
#include <cutils/multiuser.h>
@@ -167,12 +168,18 @@
*
* \param uid is the uid of the app or service.
*/
- Info getInfo(uid_t uid);
+ std::shared_ptr<const Info> getCachedInfo(uid_t uid);
+
+ /* return a singleton */
+ static UidInfo& getUidInfo();
+
+ /* returns a non-null pointer to a const Info struct */
+ static std::shared_ptr<const Info> getInfo(uid_t uid);
private:
std::mutex mLock;
// TODO: use concurrent hashmap with striped lock.
- std::unordered_map<uid_t, Info> mInfoMap; // GUARDED_BY(mLock)
+ std::unordered_map<uid_t, std::shared_ptr<const Info>> mInfoMap GUARDED_BY(mLock);
};
} // namespace mediautils