diff options
| author | Steven Laver <lavers@google.com> | 2020-01-23 17:03:21 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-02-04 23:22:55 +0000 |
| commit | 71998c3d8b36220df1be12fe6e1ba7eda81cde41 (patch) | |
| tree | 8b5e07fadfa5561f430abd298094046a496c3fb3 /tools/stats_log_api_gen/Collation.cpp | |
| parent | 4307c64762e7fd78e8cdd955296655d51a6094e2 (diff) | |
| parent | db0ac39741da692dddac3ff31aa87634af92e1e8 (diff) | |
Merge RP1A.200123.001
Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4
Diffstat (limited to 'tools/stats_log_api_gen/Collation.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/Collation.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index 0b82a3dcebc4..d290acae1967 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -291,6 +291,15 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, } if (field->options().GetExtension(os::statsd::state_field_option).option() == + os::statsd::StateField::PRIMARY_FIELD_FIRST_UID) { + if (javaType != JAVA_TYPE_ATTRIBUTION_CHAIN) { + errorCount++; + } else { + atomDecl->primaryFields.push_back(FIRST_UID_IN_CHAIN_ID); + } + } + + if (field->options().GetExtension(os::statsd::state_field_option).option() == os::statsd::StateField::EXCLUSIVE) { if (javaType == JAVA_TYPE_UNKNOWN || javaType == JAVA_TYPE_ATTRIBUTION_CHAIN || @@ -434,7 +443,7 @@ int collate_atoms(const Descriptor *descriptor, Atoms *atoms) { AtomDecl nonChainedAtomDecl(atomField->number(), atomField->name(), atom->name()); vector<java_type_t> nonChainedSignature; if (get_non_chained_node(atom, &nonChainedAtomDecl, &nonChainedSignature)) { - auto it = atoms->non_chained_signatures_to_modules.find(signature); + auto it = atoms->non_chained_signatures_to_modules.find(nonChainedSignature); if (it == atoms->non_chained_signatures_to_modules.end()) { set<string> modules_non_chained; if (atomDecl.hasModule) { |