Handle null string in jni and c++ stats-log-api interfaces. (20ac944e) · Commits · e / os / android_frameworks_base

tools/stats_log_api_gen/main.cpp

+18 −5

Original line number	Diff line number	Diff line
		@@ -166,8 +166,16 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
		attributionDecl.fields.front().name.c_str());
		fprintf(out, " event.begin();\n");
		for (const auto &chainField : attributionDecl.fields) {
		if (chainField.javaType == JAVA_TYPE_STRING) {
		fprintf(out, " if (%s[i] != NULL) {\n", chainField.name.c_str());
		fprintf(out, " event << %s[i];\n", chainField.name.c_str());
		fprintf(out, " } else {\n");
		fprintf(out, " event << \"\";\n");
		fprintf(out, " }\n");
		} else {
		fprintf(out, " event << %s[i];\n", chainField.name.c_str());
		}
		}
		fprintf(out, " event.end();\n");
		fprintf(out, " }\n");
		fprintf(out, " event.end();\n\n");
		@@ -589,6 +597,10 @@ write_stats_log_jni(FILE* out, const Atoms& atoms, const AtomDecl &attributionDe
		fprintf(out, " jstring jstr = "
		"(jstring)env->GetObjectArrayElement(%s, i);\n",
		chainField.name.c_str());
		fprintf(out, " if (jstr == NULL) {\n");
		fprintf(out, " %s_vec.push_back(NULL);\n",
		chainField.name.c_str());
		fprintf(out, " } else {\n");
		fprintf(out, " ScopedUtfChars* scoped_%s = "
		"new ScopedUtfChars(env, jstr);\n",
		chainField.name.c_str());
		@@ -597,6 +609,7 @@ write_stats_log_jni(FILE* out, const Atoms& atoms, const AtomDecl &attributionDe
		fprintf(out, " scoped_%s_vec.push_back(scoped_%s);\n",
		chainField.name.c_str(), chainField.name.c_str());
		fprintf(out, " }\n");
		fprintf(out, " }\n");
		}
		fprintf(out, "\n");
		}
		@@ -648,7 +661,7 @@ write_stats_log_jni(FILE* out, const Atoms& atoms, const AtomDecl &attributionDe
		fprintf(out, " env->ReleaseIntArrayElements(%s, %s_array, 0);\n",
		chainField.name.c_str(), chainField.name.c_str());
		} else if (chainField.javaType == JAVA_TYPE_STRING) {
		fprintf(out, " for (size_t i = 0; i < %s_length; ++i) {\n",
		fprintf(out, " for (size_t i = 0; i < scoped_%s_vec.size(); ++i) {\n",
		chainField.name.c_str());
		fprintf(out, " delete scoped_%s_vec[i];\n", chainField.name.c_str());
		fprintf(out, " }\n");