From cabd127c19aa22b67e9e1e52199070a26dacdfb0 Mon Sep 17 00:00:00 2001 From: Jeffrey Huang Date: Fri, 31 Jan 2020 17:09:56 -0800 Subject: Delete unused imports in Statsd Delete libplatformprotos since its not used. Test: m -j Bug: 147599928 Change-Id: I80203756d714bf123978d26bbe81351a1abdc967 --- cmds/statsd/Android.bp | 1 - cmds/statsd/src/HashableDimensionKey.cpp | 2 -- cmds/statsd/src/StatsLogProcessor.cpp | 6 ------ cmds/statsd/src/StatsService.cpp | 6 ------ cmds/statsd/src/StatsService.h | 2 -- cmds/statsd/src/anomaly/AlarmMonitor.h | 2 -- cmds/statsd/src/anomaly/AnomalyTracker.h | 2 -- cmds/statsd/src/anomaly/subscriber_util.cpp | 4 ---- cmds/statsd/src/condition/CombinationConditionTracker.cpp | 5 ----- cmds/statsd/src/condition/ConditionTracker.h | 2 -- cmds/statsd/src/condition/ConditionWizard.cpp | 3 --- cmds/statsd/src/condition/SimpleConditionTracker.cpp | 4 ---- cmds/statsd/src/condition/StateConditionTracker.cpp | 2 -- cmds/statsd/src/condition/condition_util.cpp | 8 -------- cmds/statsd/src/config/ConfigListener.h | 2 -- cmds/statsd/src/config/ConfigManager.cpp | 4 ---- cmds/statsd/src/config/ConfigManager.h | 2 -- cmds/statsd/src/external/Perfetto.cpp | 4 ---- cmds/statsd/src/external/PullDataReceiver.h | 2 -- cmds/statsd/src/external/StatsCallbackPuller.h | 1 - cmds/statsd/src/external/StatsPullerManager.cpp | 4 ---- cmds/statsd/src/external/StatsPullerManager.h | 2 -- cmds/statsd/src/guardrail/StatsdStats.cpp | 1 - cmds/statsd/src/logd/LogEvent.h | 2 -- cmds/statsd/src/logd/LogEventQueue.h | 2 -- cmds/statsd/src/main.cpp | 5 ----- cmds/statsd/src/matchers/CombinationLogMatchingTracker.cpp | 2 -- cmds/statsd/src/matchers/CombinationLogMatchingTracker.h | 3 --- cmds/statsd/src/matchers/EventMatcherWizard.cpp | 3 --- cmds/statsd/src/matchers/SimpleLogMatchingTracker.cpp | 2 -- cmds/statsd/src/matchers/SimpleLogMatchingTracker.h | 3 --- cmds/statsd/src/matchers/matcher_util.cpp | 1 - cmds/statsd/src/matchers/matcher_util.h | 5 ----- cmds/statsd/src/metrics/GaugeMetricProducer.cpp | 2 -- cmds/statsd/src/metrics/MetricProducer.cpp | 1 - cmds/statsd/src/metrics/MetricProducer.h | 1 - cmds/statsd/src/metrics/MetricsManager.cpp | 4 ---- cmds/statsd/src/metrics/ValueMetricProducer.cpp | 5 ----- cmds/statsd/src/metrics/ValueMetricProducer.h | 2 -- cmds/statsd/src/metrics/duration_helper/OringDurationTracker.h | 1 - cmds/statsd/src/metrics/metrics_manager_util.cpp | 1 - cmds/statsd/src/metrics/metrics_manager_util.h | 1 - cmds/statsd/src/packages/PackageInfoListener.h | 1 - cmds/statsd/src/packages/UidMap.cpp | 4 ---- cmds/statsd/src/packages/UidMap.h | 2 -- cmds/statsd/src/shell/ShellSubscriber.cpp | 1 - cmds/statsd/src/shell/ShellSubscriber.h | 1 - cmds/statsd/src/socket/StatsSocketListener.cpp | 3 --- cmds/statsd/src/state/StateManager.h | 1 - cmds/statsd/src/stats_log_util.cpp | 4 ---- cmds/statsd/src/statscompanion_util.h | 6 ------ cmds/statsd/src/storage/StorageManager.cpp | 2 -- cmds/statsd/src/subscriber/IncidentdReporter.cpp | 1 - cmds/statsd/src/subscriber/SubscriberReporter.cpp | 1 - 54 files changed, 144 deletions(-) diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index fdc7fce3b884..eaac5893eae6 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -127,7 +127,6 @@ cc_defaults { "libbase", "libcutils", "liblog", - "libplatformprotos", "libprotoutil", "libstatslog", "libstatssocket", diff --git a/cmds/statsd/src/HashableDimensionKey.cpp b/cmds/statsd/src/HashableDimensionKey.cpp index 109785f649e4..5b75b97a0764 100644 --- a/cmds/statsd/src/HashableDimensionKey.cpp +++ b/cmds/statsd/src/HashableDimensionKey.cpp @@ -16,8 +16,6 @@ #define DEBUG false // STOPSHIP if true #include "Log.h" -#include - #include "HashableDimensionKey.h" #include "FieldValue.h" diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index 34818145a922..879b3c3e52aa 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -20,11 +20,7 @@ #include "StatsLogProcessor.h" #include -#include #include -#include -#include -#include #include "android-base/stringprintf.h" #include "atoms_info.h" @@ -47,8 +43,6 @@ using android::util::FIELD_TYPE_INT64; using android::util::FIELD_TYPE_MESSAGE; using android::util::FIELD_TYPE_STRING; using android::util::ProtoOutputStream; -using std::make_unique; -using std::unique_ptr; using std::vector; namespace android { diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index c1a8d69191d2..41c2e18e6445 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -27,13 +27,11 @@ #include "subscriber/SubscriberReporter.h" #include -#include #include #include #include #include #include -#include #include #include #include @@ -42,17 +40,13 @@ #include #include #include -#include #include -#include using namespace android; using android::base::StringPrintf; using android::util::FIELD_COUNT_REPEATED; -using android::util::FIELD_TYPE_INT64; using android::util::FIELD_TYPE_MESSAGE; -using android::util::ProtoReader; namespace android { namespace os { diff --git a/cmds/statsd/src/StatsService.h b/cmds/statsd/src/StatsService.h index f2079d9f278f..3bfaa9842950 100644 --- a/cmds/statsd/src/StatsService.h +++ b/cmds/statsd/src/StatsService.h @@ -37,11 +37,9 @@ #include #include -#include #include using namespace android; -using namespace android::base; using namespace android::binder; using namespace android::frameworks::stats::V1_0; using namespace android::os; diff --git a/cmds/statsd/src/anomaly/AlarmMonitor.h b/cmds/statsd/src/anomaly/AlarmMonitor.h index bca858e67f13..219695ef5e43 100644 --- a/cmds/statsd/src/anomaly/AlarmMonitor.h +++ b/cmds/statsd/src/anomaly/AlarmMonitor.h @@ -21,8 +21,6 @@ #include #include -#include -#include #include #include diff --git a/cmds/statsd/src/anomaly/AnomalyTracker.h b/cmds/statsd/src/anomaly/AnomalyTracker.h index e9414735b82b..794ee988ef55 100644 --- a/cmds/statsd/src/anomaly/AnomalyTracker.h +++ b/cmds/statsd/src/anomaly/AnomalyTracker.h @@ -16,8 +16,6 @@ #pragma once -#include // unique_ptr - #include #include diff --git a/cmds/statsd/src/anomaly/subscriber_util.cpp b/cmds/statsd/src/anomaly/subscriber_util.cpp index 4c30c4cb223c..5a4a41d01de6 100644 --- a/cmds/statsd/src/anomaly/subscriber_util.cpp +++ b/cmds/statsd/src/anomaly/subscriber_util.cpp @@ -17,10 +17,6 @@ #define DEBUG false // STOPSHIP if true #include "Log.h" -#include -#include -#include - #include "external/Perfetto.h" #include "subscriber/IncidentdReporter.h" #include "subscriber/SubscriberReporter.h" diff --git a/cmds/statsd/src/condition/CombinationConditionTracker.cpp b/cmds/statsd/src/condition/CombinationConditionTracker.cpp index 69aae3d1e31c..2d7f912dac84 100644 --- a/cmds/statsd/src/condition/CombinationConditionTracker.cpp +++ b/cmds/statsd/src/condition/CombinationConditionTracker.cpp @@ -18,15 +18,10 @@ #include "Log.h" #include "CombinationConditionTracker.h" -#include - namespace android { namespace os { namespace statsd { -using std::map; -using std::string; -using std::unique_ptr; using std::unordered_map; using std::vector; diff --git a/cmds/statsd/src/condition/ConditionTracker.h b/cmds/statsd/src/condition/ConditionTracker.h index e94ea6586f05..26de88860ab4 100644 --- a/cmds/statsd/src/condition/ConditionTracker.h +++ b/cmds/statsd/src/condition/ConditionTracker.h @@ -21,10 +21,8 @@ #include "matchers/LogMatchingTracker.h" #include "matchers/matcher_util.h" -#include #include -#include #include namespace android { diff --git a/cmds/statsd/src/condition/ConditionWizard.cpp b/cmds/statsd/src/condition/ConditionWizard.cpp index 4f44a69ba980..c542032b48ea 100644 --- a/cmds/statsd/src/condition/ConditionWizard.cpp +++ b/cmds/statsd/src/condition/ConditionWizard.cpp @@ -14,14 +14,11 @@ * limitations under the License. */ #include "ConditionWizard.h" -#include namespace android { namespace os { namespace statsd { -using std::map; -using std::string; using std::vector; ConditionState ConditionWizard::query(const int index, const ConditionKey& parameters, diff --git a/cmds/statsd/src/condition/SimpleConditionTracker.cpp b/cmds/statsd/src/condition/SimpleConditionTracker.cpp index 0c92149f4c96..61760f3e29b2 100644 --- a/cmds/statsd/src/condition/SimpleConditionTracker.cpp +++ b/cmds/statsd/src/condition/SimpleConditionTracker.cpp @@ -24,11 +24,7 @@ namespace android { namespace os { namespace statsd { -using std::map; -using std::string; -using std::unique_ptr; using std::unordered_map; -using std::vector; SimpleConditionTracker::SimpleConditionTracker( const ConfigKey& key, const int64_t& id, const int index, diff --git a/cmds/statsd/src/condition/StateConditionTracker.cpp b/cmds/statsd/src/condition/StateConditionTracker.cpp index 7f3eeddba831..d19a1761ac00 100644 --- a/cmds/statsd/src/condition/StateConditionTracker.cpp +++ b/cmds/statsd/src/condition/StateConditionTracker.cpp @@ -23,8 +23,6 @@ namespace android { namespace os { namespace statsd { -using std::string; -using std::unordered_set; using std::vector; StateConditionTracker::StateConditionTracker(const ConfigKey& key, const int64_t& id, const int index, diff --git a/cmds/statsd/src/condition/condition_util.cpp b/cmds/statsd/src/condition/condition_util.cpp index 35e03e45c785..60b8c53e91e1 100644 --- a/cmds/statsd/src/condition/condition_util.cpp +++ b/cmds/statsd/src/condition/condition_util.cpp @@ -18,11 +18,6 @@ #include "condition_util.h" -#include -#include -#include -#include -#include #include "../matchers/matcher_util.h" #include "ConditionTracker.h" #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" @@ -32,9 +27,6 @@ namespace android { namespace os { namespace statsd { -using std::set; -using std::string; -using std::unordered_map; using std::vector; diff --git a/cmds/statsd/src/config/ConfigListener.h b/cmds/statsd/src/config/ConfigListener.h index 54e77701b7dc..dcd5e52feefd 100644 --- a/cmds/statsd/src/config/ConfigListener.h +++ b/cmds/statsd/src/config/ConfigListener.h @@ -19,14 +19,12 @@ #include "config/ConfigKey.h" #include -#include namespace android { namespace os { namespace statsd { using android::RefBase; -using std::string; /** * Callback for different subsystems inside statsd to implement to find out diff --git a/cmds/statsd/src/config/ConfigManager.cpp b/cmds/statsd/src/config/ConfigManager.cpp index 972adf7d4d05..986955bc5f39 100644 --- a/cmds/statsd/src/config/ConfigManager.cpp +++ b/cmds/statsd/src/config/ConfigManager.cpp @@ -25,8 +25,6 @@ #include "stats_util.h" #include "stats_log_util.h" -#include -#include #include #include #include "android-base/stringprintf.h" @@ -35,9 +33,7 @@ namespace android { namespace os { namespace statsd { -using std::map; using std::pair; -using std::set; using std::string; using std::vector; diff --git a/cmds/statsd/src/config/ConfigManager.h b/cmds/statsd/src/config/ConfigManager.h index 88e864a2520b..2095173e8959 100644 --- a/cmds/statsd/src/config/ConfigManager.h +++ b/cmds/statsd/src/config/ConfigManager.h @@ -20,9 +20,7 @@ #include "config/ConfigListener.h" #include -#include #include -#include #include #include diff --git a/cmds/statsd/src/external/Perfetto.cpp b/cmds/statsd/src/external/Perfetto.cpp index 0c4c3301e61e..85b660efc956 100644 --- a/cmds/statsd/src/external/Perfetto.cpp +++ b/cmds/statsd/src/external/Perfetto.cpp @@ -21,12 +21,8 @@ #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // Alert #include -#include -#include #include -#include #include -#include #include diff --git a/cmds/statsd/src/external/PullDataReceiver.h b/cmds/statsd/src/external/PullDataReceiver.h index d2193f41b80a..dd5c0cfa04c1 100644 --- a/cmds/statsd/src/external/PullDataReceiver.h +++ b/cmds/statsd/src/external/PullDataReceiver.h @@ -15,8 +15,6 @@ */ #pragma once -#include -#include #include #include "StatsPuller.h" #include "logd/LogEvent.h" diff --git a/cmds/statsd/src/external/StatsCallbackPuller.h b/cmds/statsd/src/external/StatsCallbackPuller.h index ac88524a72ee..fe6af19e3901 100644 --- a/cmds/statsd/src/external/StatsCallbackPuller.h +++ b/cmds/statsd/src/external/StatsCallbackPuller.h @@ -17,7 +17,6 @@ #pragma once #include -#include #include "StatsPuller.h" diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp index 668c11ef55f5..6611b7627749 100644 --- a/cmds/statsd/src/external/StatsPullerManager.cpp +++ b/cmds/statsd/src/external/StatsPullerManager.cpp @@ -39,12 +39,8 @@ #include "TrainInfoPuller.h" #include "statslog.h" -using std::make_shared; -using std::map; using std::shared_ptr; -using std::string; using std::vector; -using std::list; namespace android { namespace os { diff --git a/cmds/statsd/src/external/StatsPullerManager.h b/cmds/statsd/src/external/StatsPullerManager.h index f5d6057c2aec..aef16dcf2147 100644 --- a/cmds/statsd/src/external/StatsPullerManager.h +++ b/cmds/statsd/src/external/StatsPullerManager.h @@ -23,8 +23,6 @@ #include #include -#include -#include #include #include "PullDataReceiver.h" diff --git a/cmds/statsd/src/guardrail/StatsdStats.cpp b/cmds/statsd/src/guardrail/StatsdStats.cpp index a836bd14c012..3054b6d2204b 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.cpp +++ b/cmds/statsd/src/guardrail/StatsdStats.cpp @@ -36,7 +36,6 @@ using android::util::FIELD_TYPE_MESSAGE; using android::util::FIELD_TYPE_STRING; using android::util::ProtoOutputStream; using std::lock_guard; -using std::map; using std::shared_ptr; using std::string; using std::vector; diff --git a/cmds/statsd/src/logd/LogEvent.h b/cmds/statsd/src/logd/LogEvent.h index 463a1b68f885..c0c5ae6032d8 100644 --- a/cmds/statsd/src/logd/LogEvent.h +++ b/cmds/statsd/src/logd/LogEvent.h @@ -20,11 +20,9 @@ #include #include -#include #include #include #include -#include #include #include diff --git a/cmds/statsd/src/logd/LogEventQueue.h b/cmds/statsd/src/logd/LogEventQueue.h index b4fd63f119e6..9dda3d24c571 100644 --- a/cmds/statsd/src/logd/LogEventQueue.h +++ b/cmds/statsd/src/logd/LogEventQueue.h @@ -19,10 +19,8 @@ #include "LogEvent.h" #include -#include #include #include -#include namespace android { namespace os { diff --git a/cmds/statsd/src/main.cpp b/cmds/statsd/src/main.cpp index 7d446a9a1ed6..58bfeb337da4 100644 --- a/cmds/statsd/src/main.cpp +++ b/cmds/statsd/src/main.cpp @@ -20,16 +20,11 @@ #include "StatsService.h" #include "socket/StatsSocketListener.h" -#include #include #include #include -#include #include #include -#include - -#include #include #include diff --git a/cmds/statsd/src/matchers/CombinationLogMatchingTracker.cpp b/cmds/statsd/src/matchers/CombinationLogMatchingTracker.cpp index 15c067ee936d..b94a9572113e 100644 --- a/cmds/statsd/src/matchers/CombinationLogMatchingTracker.cpp +++ b/cmds/statsd/src/matchers/CombinationLogMatchingTracker.cpp @@ -24,8 +24,6 @@ namespace os { namespace statsd { using std::set; -using std::string; -using std::unique_ptr; using std::unordered_map; using std::vector; diff --git a/cmds/statsd/src/matchers/CombinationLogMatchingTracker.h b/cmds/statsd/src/matchers/CombinationLogMatchingTracker.h index 2a3f08da7b96..55bc46059fc1 100644 --- a/cmds/statsd/src/matchers/CombinationLogMatchingTracker.h +++ b/cmds/statsd/src/matchers/CombinationLogMatchingTracker.h @@ -16,9 +16,6 @@ #ifndef COMBINATION_LOG_MATCHING_TRACKER_H #define COMBINATION_LOG_MATCHING_TRACKER_H -#include -#include -#include #include #include #include "LogMatchingTracker.h" diff --git a/cmds/statsd/src/matchers/EventMatcherWizard.cpp b/cmds/statsd/src/matchers/EventMatcherWizard.cpp index 8418e9833509..025c9a87b16b 100644 --- a/cmds/statsd/src/matchers/EventMatcherWizard.cpp +++ b/cmds/statsd/src/matchers/EventMatcherWizard.cpp @@ -14,14 +14,11 @@ * limitations under the License. */ #include "EventMatcherWizard.h" -#include namespace android { namespace os { namespace statsd { -using std::map; -using std::string; using std::vector; MatchingState EventMatcherWizard::matchLogEvent(const LogEvent& event, int matcher_index) { diff --git a/cmds/statsd/src/matchers/SimpleLogMatchingTracker.cpp b/cmds/statsd/src/matchers/SimpleLogMatchingTracker.cpp index 31b3db524e80..082daf5a1916 100644 --- a/cmds/statsd/src/matchers/SimpleLogMatchingTracker.cpp +++ b/cmds/statsd/src/matchers/SimpleLogMatchingTracker.cpp @@ -23,8 +23,6 @@ namespace android { namespace os { namespace statsd { -using std::string; -using std::unique_ptr; using std::unordered_map; using std::vector; diff --git a/cmds/statsd/src/matchers/SimpleLogMatchingTracker.h b/cmds/statsd/src/matchers/SimpleLogMatchingTracker.h index 28b339caa466..a0f6a888bd44 100644 --- a/cmds/statsd/src/matchers/SimpleLogMatchingTracker.h +++ b/cmds/statsd/src/matchers/SimpleLogMatchingTracker.h @@ -17,9 +17,6 @@ #ifndef SIMPLE_LOG_MATCHING_TRACKER_H #define SIMPLE_LOG_MATCHING_TRACKER_H -#include -#include -#include #include #include #include "LogMatchingTracker.h" diff --git a/cmds/statsd/src/matchers/matcher_util.cpp b/cmds/statsd/src/matchers/matcher_util.cpp index 476fae37899d..1f8bbd7f528c 100644 --- a/cmds/statsd/src/matchers/matcher_util.cpp +++ b/cmds/statsd/src/matchers/matcher_util.cpp @@ -23,7 +23,6 @@ using std::set; using std::string; -using std::unordered_map; using std::vector; namespace android { diff --git a/cmds/statsd/src/matchers/matcher_util.h b/cmds/statsd/src/matchers/matcher_util.h index 15b4a9799a93..1ab3e87b5fed 100644 --- a/cmds/statsd/src/matchers/matcher_util.h +++ b/cmds/statsd/src/matchers/matcher_util.h @@ -18,11 +18,6 @@ #include "logd/LogEvent.h" -#include -#include -#include -#include -#include #include #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" #include "packages/UidMap.h" diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp index 4ab6fd48f1db..83983e80d479 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp @@ -21,8 +21,6 @@ #include "GaugeMetricProducer.h" #include "../stats_log_util.h" -#include - using android::util::FIELD_COUNT_REPEATED; using android::util::FIELD_TYPE_BOOL; using android::util::FIELD_TYPE_FLOAT; diff --git a/cmds/statsd/src/metrics/MetricProducer.cpp b/cmds/statsd/src/metrics/MetricProducer.cpp index 5c29cb3c27fe..be754e29b5bd 100644 --- a/cmds/statsd/src/metrics/MetricProducer.cpp +++ b/cmds/statsd/src/metrics/MetricProducer.cpp @@ -33,7 +33,6 @@ namespace android { namespace os { namespace statsd { -using std::map; // for ActiveMetric const int FIELD_ID_ACTIVE_METRIC_ID = 1; diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h index 99f0c64bd47c..d721514ed1f0 100644 --- a/cmds/statsd/src/metrics/MetricProducer.h +++ b/cmds/statsd/src/metrics/MetricProducer.h @@ -18,7 +18,6 @@ #define METRIC_PRODUCER_H #include -#include #include #include diff --git a/cmds/statsd/src/metrics/MetricsManager.cpp b/cmds/statsd/src/metrics/MetricsManager.cpp index 088f607ecfce..536700f3bfe7 100644 --- a/cmds/statsd/src/metrics/MetricsManager.cpp +++ b/cmds/statsd/src/metrics/MetricsManager.cpp @@ -18,9 +18,7 @@ #include "MetricsManager.h" -#include #include -#include #include "CountMetricProducer.h" #include "atoms_info.h" @@ -42,10 +40,8 @@ using android::util::FIELD_TYPE_MESSAGE; using android::util::FIELD_TYPE_STRING; using android::util::ProtoOutputStream; -using std::make_unique; using std::set; using std::string; -using std::unordered_map; using std::vector; namespace android { diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp index d2db6e9c9ead..2a5b5302b619 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp +++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp @@ -21,7 +21,6 @@ #include "../guardrail/StatsdStats.h" #include "../stats_log_util.h" -#include #include #include @@ -33,12 +32,8 @@ using android::util::FIELD_TYPE_INT64; using android::util::FIELD_TYPE_MESSAGE; using android::util::FIELD_TYPE_STRING; using android::util::ProtoOutputStream; -using std::list; -using std::make_pair; -using std::make_shared; using std::map; using std::shared_ptr; -using std::unique_ptr; using std::unordered_map; namespace android { diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.h b/cmds/statsd/src/metrics/ValueMetricProducer.h index 19fb6942928f..50317b341843 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.h +++ b/cmds/statsd/src/metrics/ValueMetricProducer.h @@ -17,8 +17,6 @@ #pragma once #include -#include -#include #include "anomaly/AnomalyTracker.h" #include "condition/ConditionTimer.h" #include "condition/ConditionTracker.h" diff --git a/cmds/statsd/src/metrics/duration_helper/OringDurationTracker.h b/cmds/statsd/src/metrics/duration_helper/OringDurationTracker.h index c3aad668aa78..f44e3275b83d 100644 --- a/cmds/statsd/src/metrics/duration_helper/OringDurationTracker.h +++ b/cmds/statsd/src/metrics/duration_helper/OringDurationTracker.h @@ -19,7 +19,6 @@ #include "DurationTracker.h" -#include namespace android { namespace os { namespace statsd { diff --git a/cmds/statsd/src/metrics/metrics_manager_util.cpp b/cmds/statsd/src/metrics/metrics_manager_util.cpp index 17f62b056426..40a313a14eab 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.cpp +++ b/cmds/statsd/src/metrics/metrics_manager_util.cpp @@ -40,7 +40,6 @@ #include "stats_util.h" using std::set; -using std::string; using std::unordered_map; using std::vector; diff --git a/cmds/statsd/src/metrics/metrics_manager_util.h b/cmds/statsd/src/metrics/metrics_manager_util.h index 95b2ab81fa53..5ebb232694a4 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.h +++ b/cmds/statsd/src/metrics/metrics_manager_util.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include #include diff --git a/cmds/statsd/src/packages/PackageInfoListener.h b/cmds/statsd/src/packages/PackageInfoListener.h index fcdbe69dbbd1..6c50a8c41770 100644 --- a/cmds/statsd/src/packages/PackageInfoListener.h +++ b/cmds/statsd/src/packages/PackageInfoListener.h @@ -17,7 +17,6 @@ #ifndef STATSD_PACKAGE_INFO_LISTENER_H #define STATSD_PACKAGE_INFO_LISTENER_H -#include #include namespace android { diff --git a/cmds/statsd/src/packages/UidMap.cpp b/cmds/statsd/src/packages/UidMap.cpp index 7e63bbff2d0a..ab0e86e24b02 100644 --- a/cmds/statsd/src/packages/UidMap.cpp +++ b/cmds/statsd/src/packages/UidMap.cpp @@ -21,10 +21,6 @@ #include "guardrail/StatsdStats.h" #include "packages/UidMap.h" -#include -#include -#include - #include using namespace android; diff --git a/cmds/statsd/src/packages/UidMap.h b/cmds/statsd/src/packages/UidMap.h index 2d3f6ee9c2e8..bfac6e3431b0 100644 --- a/cmds/statsd/src/packages/UidMap.h +++ b/cmds/statsd/src/packages/UidMap.h @@ -21,10 +21,8 @@ #include "packages/PackageInfoListener.h" #include "stats_util.h" -#include #include #include -#include #include #include #include diff --git a/cmds/statsd/src/shell/ShellSubscriber.cpp b/cmds/statsd/src/shell/ShellSubscriber.cpp index f7e32d4aed26..d6a04336bc46 100644 --- a/cmds/statsd/src/shell/ShellSubscriber.cpp +++ b/cmds/statsd/src/shell/ShellSubscriber.cpp @@ -18,7 +18,6 @@ #include "ShellSubscriber.h" -#include #include "matchers/matcher_util.h" #include "stats_log_util.h" diff --git a/cmds/statsd/src/shell/ShellSubscriber.h b/cmds/statsd/src/shell/ShellSubscriber.h index 8e54a8b00091..86d85901083a 100644 --- a/cmds/statsd/src/shell/ShellSubscriber.h +++ b/cmds/statsd/src/shell/ShellSubscriber.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include "external/StatsPullerManager.h" #include "frameworks/base/cmds/statsd/src/shell/shell_config.pb.h" diff --git a/cmds/statsd/src/socket/StatsSocketListener.cpp b/cmds/statsd/src/socket/StatsSocketListener.cpp index 4308a1107039..14f55abd3c20 100755 --- a/cmds/statsd/src/socket/StatsSocketListener.cpp +++ b/cmds/statsd/src/socket/StatsSocketListener.cpp @@ -27,9 +27,6 @@ #include #include -#include -#include -#include #include "StatsSocketListener.h" #include "guardrail/StatsdStats.h" diff --git a/cmds/statsd/src/state/StateManager.h b/cmds/statsd/src/state/StateManager.h index 8bc24612be90..8b3a4218238c 100644 --- a/cmds/statsd/src/state/StateManager.h +++ b/cmds/statsd/src/state/StateManager.h @@ -15,7 +15,6 @@ */ #pragma once -#include #include #include diff --git a/cmds/statsd/src/stats_log_util.cpp b/cmds/statsd/src/stats_log_util.cpp index 76c193679eef..8e0c62869932 100644 --- a/cmds/statsd/src/stats_log_util.cpp +++ b/cmds/statsd/src/stats_log_util.cpp @@ -17,12 +17,8 @@ #include "hash.h" #include "stats_log_util.h" -#include #include -#include #include -#include -#include #include using android::util::AtomsInfo; diff --git a/cmds/statsd/src/statscompanion_util.h b/cmds/statsd/src/statscompanion_util.h index ff702f23f6d1..dc4f28361214 100644 --- a/cmds/statsd/src/statscompanion_util.h +++ b/cmds/statsd/src/statscompanion_util.h @@ -18,12 +18,6 @@ #include "StatsLogProcessor.h" -using namespace android; -using namespace android::base; -using namespace android::binder; -using namespace android::os; -using namespace std; - namespace android { namespace os { namespace statsd { diff --git a/cmds/statsd/src/storage/StorageManager.cpp b/cmds/statsd/src/storage/StorageManager.cpp index 9b48a02c7f78..507297c6c401 100644 --- a/cmds/statsd/src/storage/StorageManager.cpp +++ b/cmds/statsd/src/storage/StorageManager.cpp @@ -23,10 +23,8 @@ #include "stats_log_util.h" #include -#include #include #include -#include namespace android { namespace os { diff --git a/cmds/statsd/src/subscriber/IncidentdReporter.cpp b/cmds/statsd/src/subscriber/IncidentdReporter.cpp index f1320c2f746d..d86e29131661 100644 --- a/cmds/statsd/src/subscriber/IncidentdReporter.cpp +++ b/cmds/statsd/src/subscriber/IncidentdReporter.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/cmds/statsd/src/subscriber/SubscriberReporter.cpp b/cmds/statsd/src/subscriber/SubscriberReporter.cpp index a37cad14fcbc..160b57e27c6c 100644 --- a/cmds/statsd/src/subscriber/SubscriberReporter.cpp +++ b/cmds/statsd/src/subscriber/SubscriberReporter.cpp @@ -20,7 +20,6 @@ #include "SubscriberReporter.h" using std::lock_guard; -using std::unordered_map; namespace android { namespace os { -- cgit v1.2.3-59-g8ed1b