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

Merge "Do not return cryptic strings from ClipData.Item.coerceToText"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-16 22:22:26 +00:00
committed by Android (Google) Code Review
parent fc8139d086 e1f5e13c0f
commit 1001478242
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/content/ClipData.java
View File

@@ -17,6 +17,9 @@
package android.content;
import static android.content.ContentProvider.maybeAddUserId;
import static android.content.ContentResolver.SCHEME_ANDROID_RESOURCE;
import static android.content.ContentResolver.SCHEME_CONTENT;
import static android.content.ContentResolver.SCHEME_FILE;
import android.content.res.AssetFileDescriptor;
import android.graphics.Bitmap;
@@ -374,8 +377,14 @@ public class ClipData implements Parcelable {
}
}
// If we couldn't open the URI as a stream, then the URI itself
// probably serves fairly well as a textual representation.
// If we couldn't open the URI as a stream, use the URI itself as a textual
// representation (but not for "content", "android.resource" or "file" schemes).
final String scheme = uri.getScheme();
if (SCHEME_CONTENT.equals(scheme)
|| SCHEME_ANDROID_RESOURCE.equals(scheme)
|| SCHEME_FILE.equals(scheme)) {
return "";
}
return uri.toString();
}
@@ -561,9 +570,15 @@ public class ClipData implements Parcelable {
}
}
// If we couldn't open the URI as a stream, then we can build
// some HTML text with the URI itself.
// probably serves fairly well as a textual representation.
// If we couldn't open the URI as a stream, use the URI itself as a textual
// representation (but not for "content", "android.resource" or "file" schemes).
final String scheme = mUri.getScheme();
if (SCHEME_CONTENT.equals(scheme)
|| SCHEME_ANDROID_RESOURCE.equals(scheme)
|| SCHEME_FILE.equals(scheme)) {
return "";
}
if (styled) {
return uriToStyledText(mUri.toString());
} else {
@@ -783,7 +798,7 @@ public class ClipData implements Parcelable {
*/
private static String[] getMimeTypes(ContentResolver resolver, Uri uri) {
String[] mimeTypes = null;
if ("content".equals(uri.getScheme())) {
if (SCHEME_CONTENT.equals(uri.getScheme())) {
String realType = resolver.getType(uri);
mimeTypes = resolver.getStreamTypes(uri, "*/*");
if (realType != null) {