Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443 Change-Id: I128625d46b2daf19ae7dbb8293f2415b940e9c02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1176,6 +1176,19 @@ public class ChooserActivity extends ResolverActivity implements
|
|||||||
final Intent resolveIntent = new Intent(originalIntent);
|
final Intent resolveIntent = new Intent(originalIntent);
|
||||||
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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user