Merge "Enable clang-tidy for stats-log-api-gen" into main
diff --git a/stats/enums/uwb/enums.proto b/stats/enums/uwb/enums.proto
index f8ca532..daf5aea 100644
--- a/stats/enums/uwb/enums.proto
+++ b/stats/enums/uwb/enums.proto
@@ -26,6 +26,7 @@
     FIRA = 1;
     CCC = 2;
     CUSTOMIZED = 3;
+    ALIRO = 4;
 }
 // UWB scrambled timestamp sequence (STS) type
 enum Sts {
@@ -100,4 +101,4 @@
     TWO_WAY = 2;
     DL_TDOA = 3;
     OWR_AOA = 4;
-}
\ No newline at end of file
+}
diff --git a/stats/express/catalog/bluetooth.cfg b/stats/express/catalog/bluetooth.cfg
index 6768534..600a001 100644
--- a/stats/express/catalog/bluetooth.cfg
+++ b/stats/express/catalog/bluetooth.cfg
@@ -14,7 +14,7 @@
     id: "bluetooth.value_cvsd_codec_usage_over_hfp"
     type: COUNTER
     display_name: "HFP codec usage -- CVSD"
-    description: "Counter on how many time CVSD codec is used for HFP."
+    description: "Counter on how many times CVSD codec is used for HFP."
     owner_email: "wescande@google.com"
     owner_email: "rotkiewicz@google.com"
     unit: UNIT_COUNT
@@ -24,7 +24,7 @@
     id: "bluetooth.value_msbc_codec_usage_over_hfp"
     type: COUNTER
     display_name: "HFP codec usage -- mSbc"
-    description: "Counter on how many time mSbc codec is used for HFP."
+    description: "Counter on how many times mSbc codec is used for HFP."
     owner_email: "wescande@google.com"
     owner_email: "rotkiewicz@google.com"
     unit: UNIT_COUNT
@@ -34,7 +34,7 @@
     id: "bluetooth.value_aptx_codec_usage_over_hfp"
     type: COUNTER
     display_name: "HFP codec usage -- AptX"
-    description: "Counter on how many time AptX codec is used for HFP."
+    description: "Counter on how many times AptX codec is used for HFP."
     owner_email: "wescande@google.com"
     owner_email: "rotkiewicz@google.com"
     unit: UNIT_COUNT
@@ -44,8 +44,53 @@
     id: "bluetooth.value_lc3_codec_usage_over_hfp"
     type: COUNTER
     display_name: "HFP codec usage -- LC3"
-    description: "Counter on how many time LC3 codec is used for HFP."
+    description: "Counter on how many times LC3 codec is used for HFP."
     owner_email: "wescande@google.com"
     owner_email: "rotkiewicz@google.com"
     unit: UNIT_COUNT
 }
+
+express_metric {
+    id: "bluetooth.value_auto_on_supported"
+    type: COUNTER
+    display_name: "Auto on -- support"
+    description: "How many times the Bluetooth start with AutoOnFeature supported"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_triggered"
+    type: COUNTER
+    display_name: "Auto on -- trigger"
+    description: "How many times the Bluetooth restart because of AutoOnFeature"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_disabled"
+    type: COUNTER
+    display_name: "Auto on -- disabled"
+    description: "How many times the user manually disable the AutoOnFeature"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_enabled"
+    type: COUNTER
+    display_name: "Auto on -- enabled"
+    description: "How many times the user manually enable the AutoOnFeature"
+    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
+}