Copy multi-image editor fix to QPR

Already fixed in master via https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

This is that change, but in QPR.

Test: Share multiple images from photos, verify that edit button doesn't
      appear.
Bug: 247638926
Merged-In: Id6ce93efacd54a86d870595ae32b4e6efcec0c04
Change-Id: I51b7d332b6b7e59ee559716022d795bb8de4a71c
This commit is contained in:
Matt Casey
2022-09-26 20:30:24 +00:00
parent 3e238386a8
commit 09daaaf5e2

View File

@@ -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) {