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

Commit 2f6ec22f authored by Adam Powell's avatar Adam Powell
Browse files

Restore auto-launch behavior for ACTION_CHOOSER with a single choice 

For the initial release of Marshmallow auto-launching was suppressed
for ChooserActivity if there was only a single choice in order to let
the user confirm what would be launched. In practice, many apps use
ACTION_CHOOSER when they should probably use implicit intents, but
still others have use cases where setting a default doesn't make sense
and the user should still be able to make a choice when one is
available.

As the user confirmation didn't buy much in terms of developer API
expectations (ACTION_CHOOSER being a forced choice) and it adds
speedbumps to existing apps in the ecosystem, revert this change.

Bug 27243827

Change-Id: Id8fd5385d5b1f459e80b0096efe7e2944264739a
parent 1818ef08

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

+0 −18
Original line number Diff line number Diff line
@@ -280,24 +280,6 @@ public class ChooserActivity extends ResolverActivity { 
        return true;

    }



    @Override

    boolean shouldAutoLaunchSingleChoice(TargetInfo target) {

        final Intent intent = target.getResolvedIntent();

        final ResolveInfo resolve = target.getResolveInfo();



        // When GET_CONTENT is handled by the DocumentsUI system component,

        // we're okay automatically launching it, since it offers it's own

        // intent disambiguation UI.

        if (intent != null && Intent.ACTION_GET_CONTENT.equals(intent.getAction())

                && resolve != null && resolve.priority > 0

                && resolve.activityInfo != null && DocumentsContract.PACKAGE_DOCUMENTS_UI

                        .equals(resolve.activityInfo.packageName)) {

            return true;

        }



        return false;

    }



    private void modifyTargetIntent(Intent in) {

        final String action = in.getAction();

        if (Intent.ACTION_SEND.equals(action) ||