From ba238643a4f3c73933168e6674f51aac34f074a6 Mon Sep 17 00:00:00 2001
From: 1 <mrcasey@google.com>
Date: Fri, 12 May 2023 16:12:50 +0000
Subject: [PATCH] Remove old ChooserActivity from manifest

The old ChooserActivity should never be triggered and no longer passes
CTS (the intent is already superseded by the IntentResolver version which has a higher priority).

Leave a note for readers that they're likely looking at the wrong
Chooser.

Bug: 282173439
Test: Presubmits
Change-Id: I055cb044ea3bd8f5c645e2a8b7585ac682242d06
---
 .../android/internal/app/ChooserActivity.java    |  6 ++++--
 core/res/AndroidManifest.xml                     | 16 ----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index ace8451722bb4..2b39bb4eb7a50 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -165,9 +165,11 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 /**
- * The Chooser Activity handles intent resolution specifically for sharing intents -
- * for example, those generated by @see android.content.Intent#createChooser(Intent, CharSequence).
+ * This is the legacy ChooserActivity and is not expected to be invoked, it's only here because
+ * MediaAppSelectorActivity is still depending on it. The actual chooser used by the system is
+ * at packages/modules/IntentResolver/java/src/com/android/intentresolver/ChooserActivity.java
  *
+ * The migration to the new package will be completed in a later release.
  */
 public class ChooserActivity extends ResolverActivity implements
         ChooserListAdapter.ChooserListCommunicator,
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index af08e03f313f7..693379debc8d6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7690,22 +7690,6 @@
                  android:defaultToDeviceProtectedStorage="true"
                  android:forceQueryable="true"
                  android:directBootAware="true">
-        <activity android:name="com.android.internal.app.ChooserActivity"
-                android:theme="@style/Theme.DeviceDefault.Chooser"
-                android:finishOnCloseSystemDialogs="true"
-                android:excludeFromRecents="true"
-                android:documentLaunchMode="never"
-                android:relinquishTaskIdentity="true"
-                android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
-                android:process=":ui"
-                android:exported="true"
-                android:visibleToInstantApps="true">
-            <intent-filter android:priority="100">
-                <action android:name="android.intent.action.CHOOSER" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE" />
-            </intent-filter>
-        </activity>
         <activity android:name="com.android.internal.accessibility.dialog.AccessibilityShortcutChooserActivity"
                   android:exported="false"
                   android:theme="@style/Theme.DeviceDefault.Dialog.Alert.DayNight"