Merge "Log number of custom actions and presence of modify share action" into tm-qpr-dev am: c4d380fa52 am: 58ddbae576

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21546164

Change-Id: Ic0e1f681cad67e36775a033d9f15b37c05480e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 18 insertions, 9 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index da3694c4..32b10f23 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -97,7 +97,6 @@ import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.FrameworkStatsLog;
 
 import java.io.File;
 import java.lang.annotation.Retention;
@@ -386,7 +385,6 @@ public class ChooserActivity extends ResolverActivity implements
         }
 
         getChooserActivityLogger().logShareStarted(
-                FrameworkStatsLog.SHARESHEET_STARTED,
                 getReferrerPackageName(),
                 mChooserRequest.getTargetType(),
                 mChooserRequest.getCallerChooserTargets().size(),
@@ -395,7 +393,9 @@ public class ChooserActivity extends ResolverActivity implements
                 isWorkProfile(),
                 ChooserContentPreviewUi.findPreferredContentPreview(
                         getTargetIntent(), getContentResolver(), this::isImageType),
-                mChooserRequest.getTargetAction()
+                mChooserRequest.getTargetAction(),
+                mChooserRequest.getChooserActions().size(),
+                mChooserRequest.getModifyShareAction() != null
         );
 
         mEnterTransitionAnimationDelegate.postponeTransition();
diff --git a/java/src/com/android/intentresolver/ChooserActivityLogger.java b/java/src/com/android/intentresolver/ChooserActivityLogger.java
index 331b6c07..f7ab595b 100644
--- a/java/src/com/android/intentresolver/ChooserActivityLogger.java
+++ b/java/src/com/android/intentresolver/ChooserActivityLogger.java
@@ -118,9 +118,16 @@ public class ChooserActivityLogger {
     }
 
     /** Logs a UiEventReported event for the system sharesheet completing initial start-up. */
-    public void logShareStarted(int eventId, String packageName, String mimeType,
-            int appProvidedDirect, int appProvidedApp, boolean isWorkprofile, int previewType,
-            String intent) {
+    public void logShareStarted(
+            String packageName,
+            String mimeType,
+            int appProvidedDirect,
+            int appProvidedApp,
+            boolean isWorkprofile,
+            int previewType,
+            String intent,
+            int customActionCount,
+            boolean modifyShareActionProvided) {
         mFrameworkStatsLogger.write(FrameworkStatsLog.SHARESHEET_STARTED,
                 /* event_id = 1 */ SharesheetStartedEvent.SHARE_STARTED.getId(),
                 /* package_name = 2 */ packageName,
@@ -131,8 +138,8 @@ public class ChooserActivityLogger {
                 /* is_workprofile = 7 */ isWorkprofile,
                 /* previewType = 8 */ typeFromPreviewInt(previewType),
                 /* intentType = 9 */ typeFromIntentString(intent),
-                /* num_provided_custom_actions = 10 */ 0,
-                /* modify_share_action_provided = 11 */ false);
+                /* num_provided_custom_actions = 10 */ customActionCount,
+                /* modify_share_action_provided = 11 */ modifyShareActionProvided);
     }
 
     /**
diff --git a/java/src/com/android/intentresolver/ChooserRequestParameters.java b/java/src/com/android/intentresolver/ChooserRequestParameters.java
index 83a0e2e1..3d99e475 100644
--- a/java/src/com/android/intentresolver/ChooserRequestParameters.java
+++ b/java/src/com/android/intentresolver/ChooserRequestParameters.java
@@ -77,7 +77,7 @@ public class ChooserRequestParameters {
     private final Intent mReferrerFillInIntent;
     private final ImmutableList<ComponentName> mFilteredComponentNames;
     private final ImmutableList<ChooserTarget> mCallerChooserTargets;
-    private final ImmutableList<ChooserAction> mChooserActions;
+    private final @NonNull ImmutableList<ChooserAction> mChooserActions;
     private final PendingIntent mModifyShareAction;
     private final boolean mRetainInOnStop;
 
@@ -198,6 +198,7 @@ public class ChooserRequestParameters {
         return mCallerChooserTargets;
     }
 
+    @NonNull
     public ImmutableList<ChooserAction> getChooserActions() {
         return mChooserActions;
     }
@@ -340,6 +341,7 @@ public class ChooserRequestParameters {
                 .collect(toImmutableList());
     }
 
+    @NonNull
     private static ImmutableList<ChooserAction> getChooserActions(Intent intent) {
         return streamParcelableArrayExtra(
                 intent,