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

Merge "Handle SecurityException in ClipData.Item.coerceToText"

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

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

@@ -353,6 +353,9 @@ public class ClipData implements Parcelable {
}
return builder.toString();
} catch (SecurityException e) {
Log.w("ClipData", "Failure opening stream", e);
} catch (FileNotFoundException e) {
// Unable to open content URI as text... not really an
// error, just something to ignore.
@@ -536,6 +539,9 @@ public class ClipData implements Parcelable {
return Html.escapeHtml(text);
}
} catch (SecurityException e) {
Log.w("ClipData", "Failure opening stream", e);
} catch (FileNotFoundException e) {
// Unable to open content URI as text... not really an
// error, just something to ignore.