Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Casey
2022-10-04 20:01:43 +00:00
committed by Android (Google) Code Review
parent f150b49092 09daaaf5e2
commit 7b19c4b99f
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -1114,6 +1114,19 @@ public class ChooserActivity extends ResolverActivity implements
resolveIntent.setFlags(originalIntent.getFlags() & URI_PERMISSION_INTENT_FLAGS); resolveIntent.setFlags(originalIntent.getFlags() & URI_PERMISSION_INTENT_FLAGS);
resolveIntent.setComponent(cn); resolveIntent.setComponent(cn);
resolveIntent.setAction(Intent.ACTION_EDIT); 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( final ResolveInfo ri = getPackageManager().resolveActivity(
resolveIntent, PackageManager.GET_META_DATA); resolveIntent, PackageManager.GET_META_DATA);
if (ri == null || ri.activityInfo == null) { if (ri == null || ri.activityInfo == null) {