Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d7b77e authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "Delete unused imports in Statsd" am: 9e9ce9f9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373817

Change-Id: I65d8c08fb7dc39617d5e6d8a87b941918f1fd741
parents 24b9cf1e 9e9ce9f9

cmds/statsd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ cc_defaults { 


    static_libs: [

        "libhealthhalutils",

        "libplatformprotos",

    ],



    shared_libs: [

cmds/statsd/src/HashableDimensionKey.cpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#define DEBUG false  // STOPSHIP if true

#include "Log.h"



#include <mutex>



#include "HashableDimensionKey.h"

#include "FieldValue.h"

cmds/statsd/src/StatsLogProcessor.cpp

+4 −9
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


#define DEBUG false  // STOPSHIP if true

#include "Log.h"

#include "statslog.h"



#include "StatsLogProcessor.h"



#include <android-base/file.h>

#include <dirent.h>

#include <frameworks/base/cmds/statsd/src/active_config_list.pb.h>

#include "StatsLogProcessor.h"



#include "android-base/stringprintf.h"

#include "atoms_info.h"

#include "external/StatsPullerManager.h"
@@ -29,12 +29,9 @@ 
#include "metrics/CountMetricProducer.h"

#include "stats_log_util.h"

#include "stats_util.h"

#include "statslog.h"

#include "storage/StorageManager.h"



#include <log/log_event_list.h>

#include <utils/Errors.h>

#include <utils/SystemClock.h>



using namespace android;

using android::base::StringPrintf;

using android::util::FIELD_COUNT_REPEATED;
@@ -45,8 +42,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 {

cmds/statsd/src/StatsService.cpp

+0 −6
Original line number Diff line number Diff line
@@ -27,13 +27,11 @@ 
#include "subscriber/SubscriberReporter.h"



#include <android-base/file.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <binder/PermissionController.h>

#include <cutils/multiuser.h>

#include <dirent.h>

#include <frameworks/base/cmds/statsd/src/statsd_config.pb.h>

#include <frameworks/base/cmds/statsd/src/uid_data.pb.h>

#include <private/android_filesystem_config.h>
@@ -42,17 +40,13 @@ 
#include <stdlib.h>

#include <sys/system_properties.h>

#include <unistd.h>

#include <utils/Looper.h>

#include <utils/String16.h>

#include <chrono>



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 {

cmds/statsd/src/StatsService.h

+0 −2
Original line number Diff line number Diff line
@@ -36,11 +36,9 @@ 
#include <binder/ParcelFileDescriptor.h>

#include <utils/Looper.h>



#include <deque>

#include <mutex>



using namespace android;

using namespace android::base;

using namespace android::binder;

using namespace android::frameworks::stats::V1_0;

using namespace android::os;