diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2020-06-23 01:28:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 01:28:47 +0000 |
| commit | ff0d53f089ac47a5a1247149670550a1e08b4949 (patch) | |
| tree | b0c37b44754c0edd5990ba0df20901a5521ca6aa /tools/stats_log_api_gen/Collation.cpp | |
| parent | 637cded0a595f2d54ff9faba2016f2ae7dc264f1 (diff) | |
| parent | 271cbbd708e46e97dc90676e34dcfd7378989230 (diff) | |
Merge "Remove libstatsmetadata" into rvc-dev am: 271cbbd708
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923902
Change-Id: Ief9909dfe6c21bb62e891677d3e08612241c56c3
Diffstat (limited to 'tools/stats_log_api_gen/Collation.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/Collation.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index 958e94efcf9c..a230de46dcf3 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -52,9 +52,7 @@ AtomDecl::AtomDecl(const AtomDecl& that) defaultState(that.defaultState), triggerStateReset(that.triggerStateReset), nested(that.nested), - uidField(that.uidField), - whitelisted(that.whitelisted), - truncateTimestamp(that.truncateTimestamp) { + uidField(that.uidField) { } AtomDecl::AtomDecl(int c, const string& n, const string& m) : code(c), name(n), message(m) { @@ -520,13 +518,6 @@ int collate_atoms(const Descriptor* descriptor, const string& moduleName, Atoms* shared_ptr<AtomDecl> atomDecl = make_shared<AtomDecl>(atomField->number(), atomField->name(), atom->name()); - if (atomField->options().GetExtension(os::statsd::allow_from_any_uid) == true) { - atomDecl->whitelisted = true; - if (dbg) { - printf("%s is whitelisted\n", atomField->name().c_str()); - } - } - if (atomDecl->code < PULL_ATOM_START_ID && atomField->options().GetExtension(os::statsd::truncate_timestamp)) { addAnnotationToAtomDecl(atomDecl.get(), ATOM_ID_FIELD_NUMBER, |