Merge "Add the atom to log the excessive binder proxies event" into main
diff --git a/stats/express/catalog/bluetooth.cfg b/stats/express/catalog/bluetooth.cfg
index 600a001..271cacc 100644
--- a/stats/express/catalog/bluetooth.cfg
+++ b/stats/express/catalog/bluetooth.cfg
@@ -85,12 +85,3 @@
owner_email: "wescande@google.com"
unit: UNIT_COUNT
}
-
-express_metric {
- id: "bluetooth.value_auto_on_hidden_usage"
- type: COUNTER
- display_name: "Auto on -- usage of pre-V hidden API"
- description: "How many times the AutoOnFeature is used on device prior to V"
- owner_email: "wescande@google.com"
- unit: UNIT_COUNT
-}
diff --git a/stats/stats_log_api_gen/java_writer.cpp b/stats/stats_log_api_gen/java_writer.cpp
index 3c84b54..f958934 100644
--- a/stats/stats_log_api_gen/java_writer.cpp
+++ b/stats/stats_log_api_gen/java_writer.cpp
@@ -56,8 +56,7 @@
if (annotation.minApiLevel >= API_U) { // we don't generate annotation constants for U+
continue;
}
- fprintf(out, " @android.annotation.SuppressLint(\"InlinedApi\")\n",
- annotation.name.c_str());
+ fprintf(out, " @android.annotation.SuppressLint(\"InlinedApi\")\n");
if (minApiLevel <= API_R) {
fprintf(out, " public static final byte %s =\n", annotation.name.c_str());
fprintf(out, " Build.VERSION.SDK_INT <= %s ?\n",
