Merge "Hide all system actions if there are custom actions." into udc-dev

1 files changed, 4 insertions, 2 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
index a6bc2164..2a6bff5c 100644
--- a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
@@ -75,9 +75,11 @@ abstract class ContentPreviewUi {
             FeatureFlagRepository featureFlagRepository) {
         ArrayList<ActionRow.Action> actions =
                 new ArrayList<>(systemActions.size() + customActions.size());
-        actions.addAll(systemActions);
-        if (featureFlagRepository.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)) {
+        if (featureFlagRepository.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)
+                && customActions != null && !customActions.isEmpty()) {
             actions.addAll(customActions);
+        } else {
+            actions.addAll(systemActions);
         }
         return actions;
     }