Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba238643 authored by 1's avatar 1 Committed by Matt Casey
Browse files

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
parent d6181d7c

core/java/com/android/internal/app/ChooserActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -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,

core/res/AndroidManifest.xml

+0 −16
Original line number Diff line number Diff line
@@ -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"