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

Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev

Browse Source
This commit is contained in:
Justin Koh
2014-06-10 01:05:05 +00:00
committed by Android (Google) Code Review
parent b7c39cee9e 83955cb260
commit 42c53fd646
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/text/util/Linkify.java
View File

@@ -465,6 +465,7 @@ public class Linkify {
String address; String address;
int base = 0; int base = 0;
try {
while ((address = WebView.findAddress(string)) != null) { while ((address = WebView.findAddress(string)) != null) {
int start = string.indexOf(address); int start = string.indexOf(address);
@@ -492,6 +493,12 @@ public class Linkify {
spec.url = "geo:0,0?q=" + encodedAddress; spec.url = "geo:0,0?q=" + encodedAddress;
links.add(spec); links.add(spec);
} }
} catch (UnsupportedOperationException e) {
// findAddress may fail with an unsupported exception on platforms without a WebView.
// In this case, we will not append anything to the links variable: it would have died
// in WebView.findAddress.
return;
}
} }
private static final void pruneOverlaps(ArrayList<LinkSpec> links) { private static final void pruneOverlaps(ArrayList<LinkSpec> links) {