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

Commit 7b19c4b9 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Copy multi-image editor fix to QPR" into tm-qpr-dev

parents f150b490 09daaaf5

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

+13 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,19 @@ public class ChooserActivity extends ResolverActivity implements 
        resolveIntent.setFlags(originalIntent.getFlags() & URI_PERMISSION_INTENT_FLAGS);

        resolveIntent.setComponent(cn);

        resolveIntent.setAction(Intent.ACTION_EDIT);

        String originalAction = originalIntent.getAction();

        if (Intent.ACTION_SEND.equals(originalAction)) {

            if (resolveIntent.getData() == null) {

                Uri uri = resolveIntent.getParcelableExtra(Intent.EXTRA_STREAM);

                if (uri != null) {

                    String mimeType = getContentResolver().getType(uri);

                    resolveIntent.setDataAndType(uri, mimeType);

                }

            }

        } else {

            Log.e(TAG, originalAction + " is not supported.");

            return null;

        }

        final ResolveInfo ri = getPackageManager().resolveActivity(

                resolveIntent, PackageManager.GET_META_DATA);

        if (ri == null || ri.activityInfo == null) {