Snap for 11039665 from 7a9e4a5ed8d549a4de044c94d4393f703ed857aa to studio-iguana-release

Change-Id: I856815fe7d6b8287cb354aa1dcfb6a65e0d59d17

3 files changed, 107 insertions, 2 deletions

diff --git a/protos/src/main/proto/BUILD b/protos/src/main/proto/BUILD
index 9374d68..242d8c9 100644
--- a/protos/src/main/proto/BUILD
+++ b/protos/src/main/proto/BUILD
@@ -1,4 +1,4 @@
-load("//tools/base/bazel:proto.bzl", "java_proto_library", "maven_proto_library")
+load("//tools/base/bazel:proto.bzl", "INTELLIJ_PLATFORM_PROTO_VERSION", "java_proto_library", "maven_proto_library")
 load("//tools/base/common:version.bzl", "BASE_VERSION")
 
 maven_proto_library(
@@ -10,6 +10,7 @@ maven_proto_library(
     notice = "NOTICE",
     pom_name = "Android Tools Analytics Protobufs",
     proto_java_runtime_library = [],
+    protoc_version = INTELLIJ_PLATFORM_PROTO_VERSION,
     resource_strip_prefix = "tools/analytics-library/protos/src/main/proto",
     resources = [
         "analytics_enums.proto",
@@ -23,6 +24,9 @@ maven_proto_library(
 java_proto_library(
     name = "studio.proto",
     srcs = glob(["*.proto"]),
-    proto_java_runtime_library = ["@maven//:com.google.protobuf.protobuf-java"],
+    proto_java_runtime_library = [
+        "//prebuilts/studio/intellij-sdk:studio-sdk",
+    ],
+    protoc_version = INTELLIJ_PLATFORM_PROTO_VERSION,
     visibility = ["//visibility:public"],
 )
diff --git a/protos/src/main/proto/analytics_enums.proto b/protos/src/main/proto/analytics_enums.proto
index 5e7066f..571ff16 100644
--- a/protos/src/main/proto/analytics_enums.proto
+++ b/protos/src/main/proto/analytics_enums.proto
@@ -597,6 +597,7 @@ enum BooleanOption {
     LINT_USE_K2_UAST = 175;
     USE_FULL_CLASSPATH_FOR_DEXING_TRANSFORM = 176;
     ANDROID_TEST_LEAVE_APKS_INSTALLED_AFTER_RUN = 177;
+    IDE_AVOID_TASK_REGISTRATION = 178;
 }
 
 enum OptionalBooleanOption {
diff --git a/protos/src/main/proto/studio_stats.proto b/protos/src/main/proto/studio_stats.proto
index 6c5eb8e..f424515 100644
--- a/protos/src/main/proto/studio_stats.proto
+++ b/protos/src/main/proto/studio_stats.proto
@@ -2460,6 +2460,9 @@ message EmulatorAvdInfo {
     WEAROS_SMALL_ROUND = 34;
     WEAROS_RECT = 35;
     WEAROS_SQUARE = 36;
+    PIXEL_7A = 37;
+    PIXEL_8 = 38;
+    PIXEL_8_PRO = 39;
   }
   // Name of the AVD. Deprecated as it could potentially contain PII.
   optional string name = 1 [deprecated = true];
@@ -6431,6 +6434,9 @@ message AppLinksAssistantEvent {
 
   optional LinkFilterOption link_filter_option = 13;
 
+  // The information of an interacted link collected for impact tracking.
+  optional LinksRecord links_record = 14;
+
   // UI event source.
   enum EventSource {
     // Will be deprecated and replaced by NEW_LINK_CREATION_SIDE_PANEL.
@@ -6560,6 +6566,88 @@ message AppLinksAssistantEvent {
     MANIFEST_ISSUES = 2;
     JSON_ISSUES = 3;
   }
+
+  message LinksRecord {
+    // Salted (rotating every 540 days) and SHA256 hashed value of raw_schemes.
+    repeated string anonymized_schemes = 1;
+
+    // the scheme values defined by the <data android:scheme> tag in
+    // AndroidManifest.xml, e.g. 'https", "twitter"
+    // This may be sensitive information because the scheme can be a custom
+    // string and thus restricted to "raw" sawmill access.
+    // This data is only available in and for PWG approved scenarios.
+    repeated string raw_schemes = 2;
+
+    // Salted (rotating every 540 days) and SHA256 hashed value of raw_hosts.
+    repeated string anonymized_hosts = 3;
+
+    // the host values defined by the <data android:host> tag in
+    // AndroidManifest.xml, e.g. "www.google.com", "*.twitter.com" This may be
+    // sensitive information because the host can be unreleased and thus
+    // restricted to "raw" sawmill access. This data is only available in and
+    // for PWG approved scenarios.
+    repeated string raw_hosts = 4;
+
+    // Salted (rotating every 540 days) and SHA256 hashed value of raw_paths.
+    repeated string anonymized_paths = 5;
+
+    // the path patterns defined by the <data android:path> or <data
+    // android:pathPattern>, etc. tags in AndroidManifest.xml, e.g. "/test",
+    // "/product/.*".This may be sensitive information because the path can be
+    // unreleased and thus restricted to "raw" sawmill access. This data is only
+    // available in and for PWG approved scenarios.
+    repeated string raw_paths = 6;
+
+    // The path type defined in <data android:path> or <data
+    // android:pathPattern>, etc. tags,  used as additional information to
+    // distinguish the same path string under different types. For example,
+    // a path "/p" and a path prefix "/p" match different URLs.
+    // This field should match the raw_paths and anonymized_paths field elements
+    // one to one.
+    repeated PathType path_types = 7 [packed = true];
+    enum PathType {
+      PATH_TYPE_UNSPECIFIED = 0;
+      PATH = 1;
+      PATH_PATTERN = 2;
+      PATH_PREFIX = 3;
+      PATH_EMPTY = 4;
+      PATH_SUFFIX = 5;
+      PATH_ADVANCED_PATTERN = 6;
+    }
+
+    // The user's interaction on the link, used as the reason we log this link.
+    optional InteractionType interaction_type = 8;
+    enum InteractionType {
+      INTERACTION_TYPE_UNSPECIFIED = 0;
+
+      // The recorded links are misconfigured and viewed by the user in link
+      // details page.
+      BROKEN_LINK_IN_DETAIL_PAGE = 1;
+
+      // The recorded links are misconfigured and auto-fixed.
+      BROKEN_LINK_AUTO_FIXED = 2;
+
+      // The recorded links are misconfigured and manually fixed after shown
+      // in the manual fix UI.
+      // The fixed link will be seen as a new link in the Play released version.
+      BROKEN_LINK_MANUALLY_FIXED = 3;
+
+      // The recorded links are created using the "creation new link" feature.
+      NEW_LINK_CREATED = 4;
+
+      // The recorded links are misconfigured and shown in the manual fix page.
+      // They are generally links that miss some link component.
+      // The client doesn't have to report this kind of links for the purpose of
+      // ads impact tracking, as the fixed links will no longer match the ones
+      // that miss some link component.
+      BROKEN_LINK_MANUAL_FIX_PAGE = 5;
+
+      // The recorded links are valid. The client doesn't have to report this
+      // kind of links for the purpose of ads impact tracking, as they are not
+      // contributing to additional ads revenue.
+      VALID_LINK_IN_DETAIL_PAGE = 6;
+    }
+  }
 }
 
 // ADB Assistant event details
@@ -13416,6 +13504,16 @@ message TSdkUAEvent {
     optional uint32 mapping_version = 2;
     // The encoding of which step is active/inactive, as a bitvector
     optional bytes active_steps = 3;
+    // The type of state update this entry is
+    optional Type type = 4;
+    // What does this state update describe?
+    enum Type {
+      UNSPECIFIED_TYPE = 0;
+      // The finalized initial state
+      INIT = 1;
+      // A post-init step completion change
+      DELTA = 2;
+    }
   }
 
   message FilterRun {
@@ -13878,6 +13976,8 @@ message IDeviceUsageEvent {
     EXECUTE_REMOTE_COMMAND_3 = 55;
     EXECUTE_REMOTE_COMMAND_4 = 56;
     RAW_EXEC2 = 57;
+    STAT_FILE = 58;
+    UNSUPPORTED_METHOD = 59;
   }
 
   // Whether this event is coming from `AdblibIDeviceWrapper` or `DeviceImpl`