diff options
| author | Yangster-mac <yanglu@google.com> | 2018-10-12 19:33:24 -0700 |
|---|---|---|
| committer | Yangster-mac <yanglu@google.com> | 2018-10-13 10:40:09 -0700 |
| commit | b6b77c6fb46f5f4b53880f1419339eae5df49484 (patch) | |
| tree | b32d27f50743ae699db159fbfb47303c7cc8c949 /tools/stats_log_api_gen/Collation.cpp | |
| parent | 7ccf46bed5dbd4ab585f61b98bf69ace00bd4c18 (diff) | |
Make state atom field annotation name consistent between google3 and android.
Test: statsd test
Fix: b/117681672
Change-Id: I3b0145516c594cc23565df67acc1cfa9f79d306e
Diffstat (limited to 'tools/stats_log_api_gen/Collation.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/Collation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index 4245700ed90d..d1f42f8b398e 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -251,7 +251,7 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, } atomDecl->fields.push_back(atField); - if (field->options().GetExtension(os::statsd::stateFieldOption).option() == + if (field->options().GetExtension(os::statsd::state_field_option).option() == os::statsd::StateField::PRIMARY) { if (javaType == JAVA_TYPE_UNKNOWN || javaType == JAVA_TYPE_ATTRIBUTION_CHAIN || @@ -261,7 +261,7 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, atomDecl->primaryFields.push_back(it->first); } - if (field->options().GetExtension(os::statsd::stateFieldOption).option() == + if (field->options().GetExtension(os::statsd::state_field_option).option() == os::statsd::StateField::EXCLUSIVE) { if (javaType == JAVA_TYPE_UNKNOWN || javaType == JAVA_TYPE_ATTRIBUTION_CHAIN || |