Merge "Remove enable_sharesheet_metadata_extra" into main

3 files changed, 4 insertions, 17 deletions

diff --git a/java/src/com/android/intentresolver/ChooserRequestParameters.java b/java/src/com/android/intentresolver/ChooserRequestParameters.java
index 06f56e3b..66bb66ef 100644
--- a/java/src/com/android/intentresolver/ChooserRequestParameters.java
+++ b/java/src/com/android/intentresolver/ChooserRequestParameters.java
@@ -159,11 +159,7 @@ public class ChooserRequestParameters {
         mChooserActions = getChooserActions(clientIntent);
         mModifyShareAction = getModifyShareAction(clientIntent);
 
-        if (android.service.chooser.Flags.enableSharesheetMetadataExtra()) {
-            mMetadataText = clientIntent.getCharSequenceExtra(Intent.EXTRA_METADATA_TEXT);
-        } else {
-            mMetadataText = null;
-        }
+        mMetadataText = clientIntent.getCharSequenceExtra(Intent.EXTRA_METADATA_TEXT);
     }
 
     public Intent getTargetIntent() {
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/update/SelectionChangeCallback.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/update/SelectionChangeCallback.kt
index 1d34dc75..479bff77 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/update/SelectionChangeCallback.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/update/SelectionChangeCallback.kt
@@ -136,12 +136,8 @@ private fun readCallbackResponse(
                 optional(value<IntentSender>(key))
             }
         val metadataText =
-            if (flags.enableSharesheetMetadataExtra()) {
-                bundle.readValueUpdate(EXTRA_METADATA_TEXT) { key ->
-                    optional(value<CharSequence>(key))
-                }
-            } else {
-                ValueUpdate.Absent
+            bundle.readValueUpdate(EXTRA_METADATA_TEXT) { key ->
+                optional(value<CharSequence>(key))
             }
 
         ShareouselUpdate(
diff --git a/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt b/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt
index cb47c3de..f0f72489 100644
--- a/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt
+++ b/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt
@@ -136,12 +136,7 @@ fun readChooserRequest(
                 else -> ContentTypeHint.NONE
             }
 
-        val metadataText =
-            if (flags.enableSharesheetMetadataExtra()) {
-                optional(value<CharSequence>(EXTRA_METADATA_TEXT))
-            } else {
-                null
-            }
+        val metadataText = optional(value<CharSequence>(EXTRA_METADATA_TEXT))
 
         ChooserRequest(
             targetIntent = targetIntent,