Snap for 10297225 from e7acff3d63a43b0023e016d64d1749c82c2be624 to udc-d1-release

Change-Id: If6a3a1a9f7df1ae154e947c5870c2090856bb1af

3 files changed, 86 insertions, 0 deletions

diff --git a/stats/atoms.proto b/stats/atoms.proto
index 9644bc6b..5cf38a97 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -1035,6 +1035,7 @@ message Atom {
     extensions 693; // WifiLocalOnlyRequestScanTriggered wifi_local_only_request_scan_triggered
     extensions 694; // WifiThreadTaskExecuted wifi_thread_task_executed
     extensions 696; // BluetoothProfileConnectionAttempted bluetooth_profile_connection_attempted
+    extensions 702; // AdServicesConsentMigrated ad_services_consent_migrated
     extensions 9999; // Atom9999 atom_9999
     // StatsdStats tracks platform atoms with ids up to 900.
     // Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value.
@@ -6479,6 +6480,12 @@ message ServiceRequestEventReported {
 
     /** The package name of the service lunch request */
     optional string requester_package_name = 11;
+
+    /** The process state of the requester */
+    optional android.app.ProcessStateEnum requester_process_state = 12;
+
+    /** The process state of the service host before this service request */
+    optional android.app.ProcessStateEnum service_process_state = 13;
 }
 
 /**
@@ -6544,6 +6551,9 @@ message BroadcastDeliveryEventReported {
 
     /** The procstate of the broadcast sender */
     optional android.app.ProcessStateEnum sender_proc_state = 16;
+
+    /** The procstate of the broadcast receiver before receiving this broadcast */
+    optional android.app.ProcessStateEnum receiver_process_state = 17;
 }
 
 /**
@@ -6572,6 +6582,12 @@ message ProviderAcquisitionEventReported {
 
     /** The package name of the content provider client who makes the request. */
     optional string client_package_name = 6;
+
+    /** The process state of the client */
+    optional android.app.ProcessStateEnum client_process_state = 7;
+
+    /** The process state of the content provider host before being acquired */
+    optional android.app.ProcessStateEnum provider_process_state = 8;
 }
 
 /**
diff --git a/stats/atoms/adservices/adservices_extension_atoms.proto b/stats/atoms/adservices/adservices_extension_atoms.proto
index 15fc01d4..19d5d286 100644
--- a/stats/atoms/adservices/adservices_extension_atoms.proto
+++ b/stats/atoms/adservices/adservices_extension_atoms.proto
@@ -57,6 +57,9 @@ extend Atom {
   optional AdServicesMeasurementWipeout
       ad_services_measurement_wipeout = 676
         [(module) = "adservices", (truncate_timestamp) = true];
+
+  optional AdServicesConsentMigrated ad_services_consent_migrated = 702
+  [(module) = "adservices", (truncate_timestamp) = true];
 }
 
 /**
@@ -205,3 +208,59 @@ message AdServicesMeasurementJobs {
 message AdServicesMeasurementWipeout {
   optional android.adservices.service.measurement.WipeoutCause wipeout_cause = 1;
 }
+
+/**
+ * Logs for AdServices Consent Migration after OTA.
+ * This atom captures the event of consent migration when we OTA from S to T+.
+ */
+message AdServicesConsentMigrated {
+
+  // Logs the Migration status
+  enum MigrationStatus {
+    UNSPECIFIED_MIGRATION_STATUS = 0;
+
+    // Consent migration unsuccessful
+    FAILURE = 1;
+
+    // Consent migration successful with shared prefs updated
+    SUCCESS_WITH_SHARED_PREF_UPDATED = 2;
+
+    // Consent migration successful with shared prefs not updated
+    SUCCESS_WITH_SHARED_PREF_NOT_UPDATED = 3;
+
+  }
+
+  // Logs the type of migration
+  enum MigrationType {
+    UNSPECIFIED_MIGRATION_TYPE = 0;
+
+    // Migrating consent from PPAPI to system service
+    PPAPI_TO_SYSTEM_SERVICE = 1;
+
+    // Migrating consent from App Search to system service
+    APPSEARCH_TO_SYSTEM_SERVICE = 2;
+  }
+
+  // Logs the opt-in/ opt-out value of measurement app
+  optional bool is_measurement_consent_enabled = 1;
+
+  // Logs the opt-in/ opt-out value of topics app
+  optional bool is_topics_consent_enabled = 2;
+
+  // Logs the opt-in/ opt-out value of fledge app
+  optional bool is_fledge_consent_enabled = 3;
+
+  // Logs the opt-in/ opt-out value for all apps in beta
+  optional bool is_default_consent_enabled = 4;
+
+  // Logs the type of migration
+  optional MigrationType migration_type = 5;
+
+  // Logs the region where the OTA took place
+  optional android.adservices.AdServiceSettingRegion region = 6;
+
+  // Logs the Migration status
+  optional MigrationStatus migration_status = 7;
+
+
+}
\ No newline at end of file
diff --git a/stats/enums/adservices/common/adservices_enums.proto b/stats/enums/adservices/common/adservices_enums.proto
index 8140f655..e547f3db 100644
--- a/stats/enums/adservices/common/adservices_enums.proto
+++ b/stats/enums/adservices/common/adservices_enums.proto
@@ -316,3 +316,14 @@ enum ExecutionResultCode {
   /** Skipped execution due to user consent is revoked. */
   SKIP_FOR_USER_CONSENT_REVOKED = 9;
 }
+
+// Region of the user who interacted with AdServicesSettings UI.
+enum AdServiceSettingRegion {
+  // fallback when getDeviceRegion call failed.
+  REGION_UNSPECIFIED = 0;
+  // European Union user (based on isoCountryInfo).
+  EU = 1;
+  // Non-European Union user (based on isoCountryInfo).
+  ROW = 2;
+}
+