diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2020-01-10 14:03:13 -0800 |
|---|---|---|
| committer | Muhammad Qureshi <muhammadq@google.com> | 2020-01-17 08:36:52 -0800 |
| commit | ad94425b153ebdd64427489232300fb7f556bdb3 (patch) | |
| tree | c98caeff0954553bb8cf541bb5d94db9282f8244 /tools/stats_log_api_gen/utils.cpp | |
| parent | df747d155ee8a3830fc9cf7dd46669f3472d2370 (diff) | |
Add flag to stats-log-api-gen for WorkSource.
As part of getting rid of StatsLogInternal and moving every atom to be
logged from a module, this CL addresses 2 issues:
1. Add WorkSource logging to modules.
2. Gate WorkSource logging via a CLI flag to prevent WorkSource methods
from being included in modules that are Mainline modules and can't have
@hide calls.
Bug: 147541828
Test: m
Test: atest android.cts.statsd.atom.UidAtomTests
Change-Id: Icce2f6ed7298be5e5ceebfb05d87e6fa7cd6bdbb
Diffstat (limited to 'tools/stats_log_api_gen/utils.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/utils.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/stats_log_api_gen/utils.cpp b/tools/stats_log_api_gen/utils.cpp index c65d1901ea7e..8c4abe43a49b 100644 --- a/tools/stats_log_api_gen/utils.cpp +++ b/tools/stats_log_api_gen/utils.cpp @@ -334,7 +334,7 @@ void write_java_usage(FILE* out, const string& method_name, const string& atom_c if (field->javaType == JAVA_TYPE_ATTRIBUTION_CHAIN) { fprintf(out, ", android.os.WorkSource workSource"); } else if (field->javaType == JAVA_TYPE_KEY_VALUE_PAIR) { - fprintf(out, ", SparseArray<Object> value_map"); + fprintf(out, ", android.util.SparseArray<Object> value_map"); } else if (field->javaType == JAVA_TYPE_BYTE_ARRAY) { fprintf(out, ", byte[] %s", field->name.c_str()); } else { @@ -442,7 +442,7 @@ int write_java_work_source_methods( for (vector<java_type_t>::const_iterator arg = signature.begin(); arg != signature.end(); arg++) { if (*arg == JAVA_TYPE_ATTRIBUTION_CHAIN) { - fprintf(out, ", WorkSource ws"); + fprintf(out, ", android.os.WorkSource ws"); } else { fprintf(out, ", %s arg%d", java_type_name(*arg), argIndex); } @@ -464,9 +464,10 @@ int write_java_work_source_methods( fprintf(out, " }\n"); // close for-loop // write() component. - fprintf(out, " List<WorkSource.WorkChain> workChains = ws.getWorkChains();\n"); + fprintf(out, " java.util.List<android.os.WorkSource.WorkChain> workChains = " + "ws.getWorkChains();\n"); fprintf(out, " if (workChains != null) {\n"); - fprintf(out, " for (WorkSource.WorkChain wc : workChains) {\n"); + fprintf(out, " for (android.os.WorkSource.WorkChain wc : workChains) {\n"); fprintf(out, " write(code"); for (int argIndex = 1; argIndex <= argIndexMax; argIndex++) { if (argIndex == attributionArg) { |