Snap for 10486386 from 912b0c55ec5233c6a62e1cbad62d499fa30a101c to mainline-ipsec-release
Change-Id: I02fcc0f116d4b87e829bcc903058d6452b3b9984
diff --git a/stats/atoms.proto b/stats/atoms.proto
index bf6cb52..4dc6eb7 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -23362,6 +23362,10 @@
GA_UX_LANDING_PAGE_OPT_OUT = 65;
// user clicked opt out on the landing page.
LANDING_PAGE_OPT_OUT = 66;
+ // (enrolled) user clicked on the privacy sandbox entry point.
+ PRIVACY_SANDBOX_ENTRY_POINT_CLICKED = 67;
+ // daily maintenance job was run.
+ DAILY_MAINTENANCE_JOB_FINISHED = 68;
}
// UI action performed by user.
optional AdServiceSettingsName action = 2;
@@ -23454,6 +23458,8 @@
FIRST_CONSENT_NOTIFICATION_CHANNEL = 4;
// reconsent notification.
RECONSENT_NOTIFICATION_CHANNEL = 5;
+ // consent notification reset channel.
+ CONSENT_NOTIFICATION_RESET_CHANNEL = 6;
}
// Type of privacy sandbox enrollment channel.
diff --git a/stats/atoms/wifi/wifi_extension_atoms.proto b/stats/atoms/wifi/wifi_extension_atoms.proto
index d4e889f..5860e78 100644
--- a/stats/atoms/wifi/wifi_extension_atoms.proto
+++ b/stats/atoms/wifi/wifi_extension_atoms.proto
@@ -394,14 +394,15 @@
*/
message WifiSettingInfo {
enum SettingName {
- WIFI_SCAN_ALWAYS_AVAILABLE = 0;
- WIFI_SCAN_THROTTLE = 1;
- WIFI_SCORING = 2;
- WIFI_PASSPOINT = 3;
- WIFI_WAKE = 4;
- WIFI_ENHANCED_MAC_RANDOMIZATION = 5;
- WIFI_NETWORKS_AVAILABLE_NOTIFICATION = 6;
- LOCATION_MODE = 7;
+ UNSPECIFIED = 0;
+ WIFI_SCAN_ALWAYS_AVAILABLE = 1;
+ WIFI_SCAN_THROTTLE = 2;
+ WIFI_SCORING = 3;
+ WIFI_PASSPOINT = 4;
+ WIFI_WAKE = 5;
+ WIFI_ENHANCED_MAC_RANDOMIZATION = 6;
+ WIFI_NETWORKS_AVAILABLE_NOTIFICATION = 7;
+ LOCATION_MODE = 8;
}
// Name of the Wifi setting
@@ -415,12 +416,14 @@
*/
message WifiComplexSettingInfo {
enum MultiInternetMode {
+ // Default value. Mode is unknown.
+ MULTI_INTERNET_MODE_UNSPECIFIED = 0;
// Simultaneous connection to multiple APs is disabled
- MULTI_INTERNET_MODE_DISABLED = 0;
+ MULTI_INTERNET_MODE_DISABLED = 1;
// Enabled but restricted to a single network on multiple bands
- MULTI_INTERNET_MODE_DBS_AP = 1;
+ MULTI_INTERNET_MODE_DBS_AP = 2;
// Enabled and allowed to connect to multiple APs using different bands
- MULTI_INTERNET_MODE_MULTI_AP = 2;
+ MULTI_INTERNET_MODE_MULTI_AP = 3;
}
// Wifi multi-internet mode
diff --git a/stats/enums/stats/connectivity/network_stack.proto b/stats/enums/stats/connectivity/network_stack.proto
index 4b63bc3..38005a4 100644
--- a/stats/enums/stats/connectivity/network_stack.proto
+++ b/stats/enums/stats/connectivity/network_stack.proto
@@ -67,6 +67,14 @@
TT_WIFI_CELLULAR_VPN = 11;
// Indicates this network uses for test only
TT_TEST = 12;
+ // Indicates this network uses a USB transport
+ TT_USB = 13;
+ // Indicates this network uses a Thread transport
+ TT_THREAD = 14;
+ // Indicates this network uses a USB+VPN transport
+ TT_USB_VPN = 15;
+ // Indicates this network uses a Thread+VPN transport
+ TT_THREAD_VPN = 16;
}
enum DhcpFeature {
