Merge "Fix performance-for-range-copy warnings" (bc292422) · Commits · e / os / android_frameworks_base

cmds/statsd/src/config/ConfigManager.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -106,14 +106,14 @@ void ConfigManager::UpdateConfig(const ConfigKey& key, const StatsdConfig& confi
		// Add to set.
		mConfigs[key.GetUid()].insert(key);

		for (sp<ConfigListener> listener : mListeners) {
		for (const sp<ConfigListener>& listener : mListeners) {
		broadcastList.push_back(listener);
		}
		}

		const int64_t timestampNs = getElapsedRealtimeNs();
		// Tell everyone
		for (sp<ConfigListener> listener : broadcastList) {
		for (const sp<ConfigListener>& listener : broadcastList) {
		listener->OnConfigUpdated(timestampNs, key, config);
		}
		}
		@@ -137,7 +137,7 @@ void ConfigManager::RemoveConfig(const ConfigKey& key) {
		if (uidIt != mConfigs.end() && uidIt->second.find(key) != uidIt->second.end()) {
		// Remove from map
		uidIt->second.erase(key);
		for (sp<ConfigListener> listener : mListeners) {
		for (const sp<ConfigListener>& listener : mListeners) {
		broadcastList.push_back(listener);
		}
		}
		@@ -153,7 +153,7 @@ void ConfigManager::RemoveConfig(const ConfigKey& key) {
		remove_saved_configs(key);
		}

		for (sp<ConfigListener> listener:broadcastList) {
		for (const sp<ConfigListener>& listener:broadcastList) {
		listener->OnConfigRemoved(key);
		}
		}
		@@ -183,7 +183,7 @@ void ConfigManager::RemoveConfigs(int uid) {

		mConfigs.erase(uidIt);

		for (sp<ConfigListener> listener : mListeners) {
		for (const sp<ConfigListener>& listener : mListeners) {
		broadcastList.push_back(listener);
		}
		}
		@@ -191,7 +191,7 @@ void ConfigManager::RemoveConfigs(int uid) {
		// Remove separately so if they do anything in the callback they can't mess up our iteration.
		for (auto& key : removed) {
		// Tell everyone
		for (sp<ConfigListener> listener:broadcastList) {
		for (const sp<ConfigListener>& listener:broadcastList) {
		listener->OnConfigRemoved(key);
		}
		}
		@@ -213,7 +213,7 @@ void ConfigManager::RemoveAllConfigs() {
		}

		mConfigReceivers.clear();
		for (sp<ConfigListener> listener : mListeners) {
		for (const sp<ConfigListener>& listener : mListeners) {
		broadcastList.push_back(listener);
		}
		}
		@@ -221,7 +221,7 @@ void ConfigManager::RemoveAllConfigs() {
		// Remove separately so if they do anything in the callback they can't mess up our iteration.
		for (auto& key : removed) {
		// Tell everyone
		for (sp<ConfigListener> listener:broadcastList) {
		for (const sp<ConfigListener>& listener:broadcastList) {
		listener->OnConfigRemoved(key);
		}
		}

cmds/statsd/src/external/SubsystemSleepStatePuller.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ bool SubsystemSleepStatePuller::PullInternal(vector<shared_ptr<LogEvent>>* data)
		(long long)state.residencyInMsecSinceBoot,
		(long long)state.totalTransitions,
		state.supportedOnlyInSuspend ? 1 : 0);
		for (auto voter : state.voters) {
		for (const auto& voter : state.voters) {
		auto voterPtr = make_shared<LogEvent>(
		android::util::SUBSYSTEM_SLEEP_STATE,
		wallClockTimestampNs, elapsedTimestampNs);

cmds/statsd/src/metrics/MetricsManager.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ void MetricsManager::onPeriodicAlarmFired(
		// Returns the total byte size of all metrics managed by a single config source.
		size_t MetricsManager::byteSize() {
		size_t totalSize = 0;
		for (auto metricProducer : mAllMetricProducers) {
		for (const auto& metricProducer : mAllMetricProducers) {
		totalSize += metricProducer->byteSize();
		}
		return totalSize;

cmds/statsd/src/metrics/metrics_manager_util.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config,
		}
		noReportMetricIds.insert(no_report_metric);
		}
		for (auto it : allMetricProducers) {
		for (const auto& it : allMetricProducers) {
		uidMap.addListener(it);
		}
		return true;

cmds/statsd/src/packages/UidMap.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ void UidMap::updateMap(const int64_t& timestamp, const vector<int32_t>& uid,
		// listener removes itself before we call it. It's then the listener's job to handle it (expect
		// the callback to be called after listener is removed, and the listener should properly
		// ignore it).
		for (auto weakPtr : broadcastList) {
		for (const auto& weakPtr : broadcastList) {
		auto strongPtr = weakPtr.promote();
		if (strongPtr != NULL) {
		strongPtr->onUidMapReceived(timestamp);
		@@ -181,7 +181,7 @@ void UidMap::updateApp(const int64_t& timestamp, const String16& app_16, const i
		StatsdStats::getInstance().setUidMapChanges(mChanges.size());
		}

		for (auto weakPtr : broadcastList) {
		for (const auto& weakPtr : broadcastList) {
		auto strongPtr = weakPtr.promote();
		if (strongPtr != NULL) {
		strongPtr->notifyAppUpgrade(timestamp, appName, uid, versionCode);
		@@ -248,7 +248,7 @@ void UidMap::removeApp(const int64_t& timestamp, const String16& app_16, const i
		getListenerListCopyLocked(&broadcastList);
		}

		for (auto weakPtr : broadcastList) {
		for (const auto& weakPtr : broadcastList) {
		auto strongPtr = weakPtr.promote();
		if (strongPtr != NULL) {
		strongPtr->notifyAppRemoved(timestamp, app, uid);