Merge "StatsEvent annotations java autogen" into rvc-dev (29613e8f) · Commits · e / os / android_frameworks_base

tools/stats_log_api_gen/java_writer.cpp

+37 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,40 @@ static int write_java_q_logger_class(
		return 0;
		}

		static void write_annotations(
		FILE* out, int argIndex,
		const FieldNumberToAnnotations& fieldNumberToAnnotations) {
		auto it = fieldNumberToAnnotations.find(argIndex);
		if (it == fieldNumberToAnnotations.end()) {
		return;
		}
		const set<shared_ptr<Annotation>>& annotations = it->second;
		for (auto& annotation: annotations) {
		// TODO(b/151744250): Group annotations for same atoms.
		// TODO(b/151786433): Write atom constant name instead of atom id literal.
		fprintf(out, " if (code == %d) {\n", annotation->atomId);
		switch(annotation->type) {
		case ANNOTATION_TYPE_INT:
		// TODO(b/151776731): Check for reset state annotation and only include reset state
		// when field value == default state annotation value.
		// TODO(b/151786433): Write annotation constant name instead of
		// annotation id literal.
		fprintf(out, " builder.addIntAnnotation((byte) %d, %d);\n",
		annotation->annotationId, annotation->value.intValue);
		break;
		case ANNOTATION_TYPE_BOOL:
		// TODO(b/151786433): Write annotation constant name instead of
		// annotation id literal.
		fprintf(out, " builder.addBooleanAnnotation((byte) %d, %s);\n",
		annotation->annotationId,
		annotation->value.boolValue ? "true" : "false");
		break;
		default:
		break;
		}
		fprintf(out, " }\n");
		}
		}

		static int write_java_methods(
		FILE* out,
		@@ -52,7 +86,8 @@ static int write_java_methods(
		signatureInfoMapIt != signatureInfoMap.end(); signatureInfoMapIt++) {
		// Print method signature.
		fprintf(out, " public static void write(int code");
		vector<java_type_t> signature = signatureInfoMapIt->first;
		const vector<java_type_t>& signature = signatureInfoMapIt->first;
		const FieldNumberToAnnotations& fieldNumberToAnnotations = signatureInfoMapIt->second;
		int argIndex = 1;
		for (vector<java_type_t>::const_iterator arg = signature.begin();
		arg != signature.end(); arg++) {
		@@ -202,6 +237,7 @@ static int write_java_methods(
		fprintf(stderr, "Encountered unsupported type.");
		return 1;
		}
		write_annotations(out, argIndex, fieldNumberToAnnotations);
		argIndex++;
		}

tools/stats_log_api_gen/utils.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -323,10 +323,10 @@ int write_java_non_chained_methods(
		for (vector<java_type_t>::const_iterator arg = signature.begin();
		arg != signature.end(); arg++) {
		if (*arg == JAVA_TYPE_ATTRIBUTION_CHAIN) {
		// Non chained signatures should not have attribution chains.
		fprintf(stderr, "Non chained signatures should not have attribution chains.\n");
		return 1;
		} else if (*arg == JAVA_TYPE_KEY_VALUE_PAIR) {
		// Module logging does not yet support key value pair.
		fprintf(stderr, "Module logging does not yet support key value pair.\n");
		return 1;
		} else {
		fprintf(out, ", %s arg%d", java_type_name(*arg), argIndex);