Remove android.service.chooser.chooser_payload_toggling flag

Bug: 302691505
Test: presubmits
Flag: EXEMPT flag removal
Change-Id: I5250ac14301e09274d5e971349d3e44cd25545ef

8 files changed, 19 insertions, 62 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index c8387c4e..250edaf2 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -171,7 +171,6 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 
 /**
  * The Chooser Activity handles intent resolution specifically for sharing intents -
@@ -257,16 +256,13 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     @Inject @Background public CoroutineDispatcher mBackgroundDispatcher;
     @Inject public ChooserHelper mChooserHelper;
     @Inject public FeatureFlags mFeatureFlags;
-    @Inject public android.service.chooser.FeatureFlags mChooserServiceFeatureFlags;
     @Inject public EventLog mEventLog;
     @Inject @AppPredictionAvailable public boolean mAppPredictionAvailable;
     @Inject @ImageEditor public Optional<ComponentName> mImageEditor;
     @Inject @NearbyShare public Optional<ComponentName> mNearbyShare;
-    protected TargetDataLoader mTargetDataLoader;
-    @Inject public Provider<TargetDataLoader> mTargetDataLoaderProvider;
     @Inject
     @Caching
-    public Provider<TargetDataLoader> mCachingTargetDataLoaderProvider;
+    public TargetDataLoader mTargetDataLoader;
     @Inject public DevicePolicyResources mDevicePolicyResources;
     @Inject public ProfilePagerResources mProfilePagerResources;
     @Inject public PackageManager mPackageManager;
@@ -345,20 +341,14 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
         Log.i(TAG, "onCreate");
         mActivityModelRepository.initialize(this::createActivityModel);
 
-        mTargetDataLoader = mChooserServiceFeatureFlags.chooserPayloadToggling()
-                ? mCachingTargetDataLoaderProvider.get()
-                : mTargetDataLoaderProvider.get();
-
         setTheme(R.style.Theme_DeviceDefault_Chooser);
 
         // Initializer is invoked when this function returns, via Lifecycle.
         mChooserHelper.setInitializer(this::initialize);
-        if (mChooserServiceFeatureFlags.chooserPayloadToggling()) {
-            mChooserHelper.setOnChooserRequestChanged(this::onChooserRequestChanged);
-            mChooserHelper.setOnPendingSelection(this::onPendingSelection);
-            if (unselectFinalItem()) {
-                mChooserHelper.setOnHasSelections(this::onHasSelections);
-            }
+        mChooserHelper.setOnChooserRequestChanged(this::onChooserRequestChanged);
+        mChooserHelper.setOnPendingSelection(this::onPendingSelection);
+        if (unselectFinalItem()) {
+            mChooserHelper.setOnHasSelections(this::onHasSelections);
         }
     }
     private int mInitialProfile = -1;
@@ -659,8 +649,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
                 mEnterTransitionAnimationDelegate,
                 new HeadlineGeneratorImpl(this),
                 mRequest.getContentTypeHint(),
-                mRequest.getMetadataText(),
-                mChooserServiceFeatureFlags.chooserPayloadToggling());
+                mRequest.getMetadataText());
         updateStickyContentPreview();
         if (shouldShowStickyContentPreview()) {
             getEventLog().logActionShareWithPreview(
@@ -777,9 +766,6 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     }
 
     private void recreatePagerAdapter() {
-        if (!mChooserServiceFeatureFlags.chooserPayloadToggling()) {
-            return;
-        }
         destroyProfileRecords();
         createProfileRecords(
                 new AppPredictorFactory(
@@ -2454,17 +2440,12 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
         // ResolverListAdapter#mPostListReadyRunnable is executed.
         if (chooserListAdapter.getDisplayResolveInfoCount() == 0) {
             Log.d(TAG, "getDisplayResolveInfoCount() == 0");
-            if (rebuildComplete && mChooserServiceFeatureFlags.chooserPayloadToggling()) {
+            if (rebuildComplete) {
                 onAppTargetsLoaded(listAdapter);
             }
             chooserListAdapter.notifyDataSetChanged();
         } else {
-            if (mChooserServiceFeatureFlags.chooserPayloadToggling()) {
-                chooserListAdapter.updateAlphabeticalList(
-                        () -> onAppTargetsLoaded(listAdapter));
-            } else {
-                chooserListAdapter.updateAlphabeticalList();
-            }
+            chooserListAdapter.updateAlphabeticalList(() -> onAppTargetsLoaded(listAdapter));
         }
 
         if (rebuildComplete) {
diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java
index c2bb1f23..563d7d1a 100644
--- a/java/src/com/android/intentresolver/ChooserListAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserListAdapter.java
@@ -518,13 +518,6 @@ public class ChooserListAdapter extends ResolverListAdapter {
     /**
      * Group application targets
      */
-    public void updateAlphabeticalList() {
-        updateAlphabeticalList(() -> {});
-    }
-
-    /**
-     * Group application targets
-     */
     public void updateAlphabeticalList(Runnable onCompleted) {
         final DisplayResolveInfoAzInfoComparator
                 comparator = new DisplayResolveInfoAzInfoComparator(mContext);
diff --git a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
index 1128ec5d..4166e5ae 100644
--- a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
@@ -51,7 +51,6 @@ import java.util.function.Supplier;
 public final class ChooserContentPreviewUi {
 
     private final CoroutineScope mScope;
-    private final boolean mIsPayloadTogglingEnabled;
 
     /**
      * Delegate to build the default system action buttons to display in the preview layout, if/when
@@ -109,11 +108,8 @@ public final class ChooserContentPreviewUi {
             TransitionElementStatusCallback transitionElementStatusCallback,
             HeadlineGenerator headlineGenerator,
             ContentTypeHint contentTypeHint,
-            @Nullable CharSequence metadata,
-            // TODO: replace with the FeatureFlag ref when v1 is gone
-            boolean isPayloadTogglingEnabled) {
+            @Nullable CharSequence metadata) {
         mScope = scope;
-        mIsPayloadTogglingEnabled = isPayloadTogglingEnabled;
         mModifyShareActionFactory = modifyShareActionFactory;
         mContentPreviewUi = createContentPreview(
                 previewData,
@@ -169,7 +165,7 @@ public final class ChooserContentPreviewUi {
             return fileContentPreviewUi;
         }
 
-        if (previewType == CONTENT_PREVIEW_PAYLOAD_SELECTION && mIsPayloadTogglingEnabled) {
+        if (previewType == CONTENT_PREVIEW_PAYLOAD_SELECTION) {
             transitionElementStatusCallback.onAllTransitionElementsReady(); // TODO
             return new ShareouselContentPreviewUi();
         }
diff --git a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
index 07cbaa04..d7b9077d 100644
--- a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
+++ b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
@@ -24,7 +24,6 @@ import android.provider.DocumentsContract
 import android.provider.DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL
 import android.provider.Downloads
 import android.provider.OpenableColumns
-import android.service.chooser.Flags.chooserPayloadToggling
 import android.text.TextUtils
 import android.util.Log
 import androidx.annotation.OpenForTesting
@@ -133,7 +132,7 @@ constructor(
              * IMAGE, FILE, TEXT. */
             if (!targetIntent.isSend || records.isEmpty()) {
                 CONTENT_PREVIEW_TEXT
-            } else if (chooserPayloadToggling() && shouldShowPayloadSelection()) {
+            } else if (shouldShowPayloadSelection()) {
                 // TODO: replace with the proper flags injection
                 CONTENT_PREVIEW_PAYLOAD_SELECTION
             } else {
diff --git a/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt b/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt
index 86ebb9d9..d0bd9740 100644
--- a/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt
+++ b/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt
@@ -31,16 +31,13 @@ import dagger.hilt.android.scopes.ActivityScoped
 object TargetDataLoaderModule {
     @Provides
     @ActivityScoped
-    fun targetDataLoader(
-        @ActivityContext context: Context,
-        @ActivityOwned lifecycle: Lifecycle,
-    ): TargetDataLoader = DefaultTargetDataLoader(context, lifecycle, isAudioCaptureDevice = false)
-
-    @Provides
-    @ActivityScoped
     @Caching
     fun cachingTargetDataLoader(
         @ActivityContext context: Context,
-        targetDataLoader: TargetDataLoader,
-    ): TargetDataLoader = CachingTargetDataLoader(context, targetDataLoader)
+        @ActivityOwned lifecycle: Lifecycle,
+    ): TargetDataLoader =
+        CachingTargetDataLoader(
+            context,
+            DefaultTargetDataLoader(context, lifecycle, isAudioCaptureDevice = false),
+        )
 }
diff --git a/java/src/com/android/intentresolver/inject/ActivityModelModule.kt b/java/src/com/android/intentresolver/inject/ActivityModelModule.kt
index 5b92c05b..60eff925 100644
--- a/java/src/com/android/intentresolver/inject/ActivityModelModule.kt
+++ b/java/src/com/android/intentresolver/inject/ActivityModelModule.kt
@@ -49,11 +49,10 @@ object ActivityModelModule {
     fun provideInitialRequest(
         activityModelRepo: ActivityModelRepository,
         savedStateHandle: SavedStateHandle,
-        flags: ChooserServiceFlags,
     ): ValidationResult<ChooserRequest> {
         val activityModel = activityModelRepo.value
         val extras = restoreChooserRequestExtras(activityModel.intent.extras, savedStateHandle)
-        return readChooserRequest(activityModel, flags, extras)
+        return readChooserRequest(activityModel, extras)
     }
 
     @Provides
diff --git a/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt b/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt
index 846cae9e..1644e409 100644
--- a/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt
+++ b/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt
@@ -48,7 +48,6 @@ import com.android.intentresolver.R
 import com.android.intentresolver.data.model.ChooserRequest
 import com.android.intentresolver.ext.hasSendAction
 import com.android.intentresolver.ext.ifMatch
-import com.android.intentresolver.inject.ChooserServiceFlags
 import com.android.intentresolver.shared.model.ActivityModel
 import com.android.intentresolver.util.hasValidIcon
 import com.android.intentresolver.validation.Validation
@@ -69,7 +68,6 @@ internal fun Intent.maybeAddSendActionFlags() =
 
 fun readChooserRequest(
     model: ActivityModel,
-    flags: ChooserServiceFlags,
     savedState: Bundle = model.intent.extras ?: Bundle(),
 ): ValidationResult<ChooserRequest> {
     @Suppress("DEPRECATION")
@@ -126,7 +124,7 @@ fun readChooserRequest(
 
         val additionalContentUri: Uri?
         val focusedItemPos: Int
-        if (isSendAction && flags.chooserPayloadToggling()) {
+        if (isSendAction) {
             additionalContentUri = optional(value<Uri>(EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI))
             focusedItemPos = optional(value<Int>(EXTRA_CHOOSER_FOCUSED_ITEM_POSITION)) ?: 0
         } else {
diff --git a/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt b/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt
index 2292a63c..8597d802 100644
--- a/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt
+++ b/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt
@@ -32,7 +32,6 @@ import com.android.intentresolver.data.repository.ActivityModelRepository
 import com.android.intentresolver.data.repository.ChooserRequestRepository
 import com.android.intentresolver.domain.saveUpdates
 import com.android.intentresolver.inject.Background
-import com.android.intentresolver.inject.ChooserServiceFlags
 import com.android.intentresolver.shared.model.ActivityModel
 import com.android.intentresolver.validation.Invalid
 import com.android.intentresolver.validation.Valid
@@ -59,7 +58,6 @@ constructor(
     private val processUpdatesInteractor: Lazy<ProcessTargetIntentUpdatesInteractor>,
     private val fetchPreviewsInteractor: Lazy<FetchPreviewsInteractor>,
     @Background private val bgDispatcher: CoroutineDispatcher,
-    private val flags: ChooserServiceFlags,
     /**
      * Provided only for the express purpose of early exit in the event of an invalid request.
      *
@@ -77,10 +75,6 @@ constructor(
     val shareouselViewModel: ShareouselViewModel by lazy {
         // TODO: consolidate this logic, this would require a consolidated preview view model but
         //  for now just postpone starting the payload selection preview machinery until it's needed
-        assert(flags.chooserPayloadToggling()) {
-            "An attempt to use payload selection preview with the disabled flag"
-        }
-
         viewModelScope.launch(bgDispatcher) { processUpdatesInteractor.get().activate() }
         viewModelScope.launch(bgDispatcher) { fetchPreviewsInteractor.get().activate() }
         shareouselViewModelProvider.get()