Merge "Fix thread safety issue on clearing cache" (b5671dc8) · Commits · e / os / android_frameworks_base

cmds/statsd/src/external/StatsPullerManager.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -315,6 +315,7 @@ void StatsPullerManager::OnAlarmFired(int64_t elapsedTimeNs) {
		}

		int StatsPullerManager::ForceClearPullerCache() {
		std::lock_guard<std::mutex> _l(mLock);
		int totalCleared = 0;
		for (const auto& pulledAtom : kAllPullAtomInfo) {
		totalCleared += pulledAtom.second->ForceClearCache();
		@@ -323,6 +324,7 @@ int StatsPullerManager::ForceClearPullerCache() {
		}

		int StatsPullerManager::ClearPullerCacheIfNecessary(int64_t timestampNs) {
		std::lock_guard<std::mutex> _l(mLock);
		int totalCleared = 0;
		for (const auto& pulledAtom : kAllPullAtomInfo) {
		totalCleared += pulledAtom.second->ClearCacheIfNecessary(timestampNs);