commit 0bfd29daf343e6927281784d54e5466e6d15dfeb
author Matt Casey <mrcasey@google.com> Fri Jan 27 02:44:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 27 02:44:59 2023 +0000
tree 737b6eea2053743154a3abb6d3f2dd969f64c414
parent 2b4770d31ae3c917c74b261402405122d7fec742
parent 7c90c0a3e2f879866906866d868ee08164c6d42d

Merge "Add custom action and reselection logging params to IntentResolver" into tm-qpr-dev

java/src/com/android/intentresolver/ChooserActivityLogger.java

diff --git a/java/src/com/android/intentresolver/ChooserActivityLogger.java b/java/src/com/android/intentresolver/ChooserActivityLogger.java
index 9109bf9..1725a7b 100644
--- a/java/src/com/android/intentresolver/ChooserActivityLogger.java
+++ b/java/src/com/android/intentresolver/ChooserActivityLogger.java
@@ -66,7 +66,9 @@
                 int numAppProvidedAppTargets,
                 boolean isWorkProfile,
                 int previewType,
-                int intentType);
+                int intentType,
+                int numCustomActions,
+                boolean reselectionActionProvided);
 
         /** Overload to use for logging {@code FrameworkStatsLog.RANKING_SELECTED}. */
         void write(
@@ -126,7 +128,9 @@
                 /* num_app_provided_app_targets = 6 */ appProvidedApp,
                 /* is_workprofile = 7 */ isWorkprofile,
                 /* previewType = 8 */ typeFromPreviewInt(previewType),
-                /* intentType = 9 */ typeFromIntentString(intent));
+                /* intentType = 9 */ typeFromIntentString(intent),
+                /* num_provided_custom_actions = 10 */ 0,
+                /* reselection_action_provided = 11 */ false);
     }
 
     /**
@@ -463,7 +467,9 @@
                 int numAppProvidedAppTargets,
                 boolean isWorkProfile,
                 int previewType,
-                int intentType) {
+                int intentType,
+                int numCustomActions,
+                boolean reselectionActionProvided) {
             FrameworkStatsLog.write(
                     frameworkEventId,
                     /* event_id = 1 */ appEventId,
@@ -474,7 +480,9 @@
                     /* num_app_provided_app_targets */ numAppProvidedAppTargets,
                     /* is_workprofile */ isWorkProfile,
                     /* previewType = 8 */ previewType,
-                    /* intentType = 9 */ intentType);
+                    /* intentType = 9 */ intentType,
+                    /* num_provided_custom_actions = 10 */ numCustomActions,
+                    /* reselection_action_provided = 11 */ reselectionActionProvided);
         }
 
         @Override

java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java

diff --git a/java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java b/java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java
index 705a322..c6a9b63 100644
--- a/java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java
+++ b/java/tests/src/com/android/intentresolver/ChooserActivityLoggerTest.java
@@ -141,7 +141,9 @@
                 eq(appProvidedAppTargets),
                 eq(workProfile),
                 eq(FrameworkStatsLog.SHARESHEET_STARTED__PREVIEW_TYPE__CONTENT_PREVIEW_FILE),
-                eq(FrameworkStatsLog.SHARESHEET_STARTED__INTENT_TYPE__INTENT_ACTION_SENDTO));
+                eq(FrameworkStatsLog.SHARESHEET_STARTED__INTENT_TYPE__INTENT_ACTION_SENDTO),
+                /* custom actions provided */ eq(0),
+                /* reselection action provided */ eq(false));
     }
 
     @Test