diff options
| author | Bill Peckham <bpeckham@google.com> | 2018-11-05 17:12:23 -0800 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2018-11-05 17:12:23 -0800 |
| commit | ba167de93776a7e5d1b347d1ee646e161cf24ce5 (patch) | |
| tree | f1ced04b88bd977af08011e6c7e4124ebe8aa293 /tools/stats_log_api_gen/Collation.cpp | |
| parent | f893260618712d3894d1279e27ee121d4be8817f (diff) | |
| parent | 828551df83149d4b5754757d8b2dc36f55f24cad (diff) | |
Merge QP1A.181022.001
Change-Id: I0e200ff664739f0bce5a55806ac4fc95fbbff52d
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 || |