summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralanv <alanv@google.com>2012-10-19 12:57:41 -0700
committeralanv <alanv@google.com>2012-10-19 12:57:41 -0700
commitac6e50a6712706c56a2e1112a594c3ddb69376d7 (patch)
tree7f84ce6d929489ba6f07dea298f6542801a29c45
parent983faeed0b8090e12d10a31624e1cf09ff30c20c (diff)
downloadframeworks_base-ac6e50a6712706c56a2e1112a594c3ddb69376d7.zip
frameworks_base-ac6e50a6712706c56a2e1112a594c3ddb69376d7.tar.gz
frameworks_base-ac6e50a6712706c56a2e1112a594c3ddb69376d7.tar.bz2
Catch badly formed URLs in WebView accessibility injector.
Bug: 7206684 Change-Id: I13e8f29043314430ea3fcfa8ab59040136d06e57
-rw-r--r--core/java/android/webkit/AccessibilityInjector.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/AccessibilityInjector.java b/core/java/android/webkit/AccessibilityInjector.java
index fe5cad4..95a0416 100644
--- a/core/java/android/webkit/AccessibilityInjector.java
+++ b/core/java/android/webkit/AccessibilityInjector.java
@@ -514,6 +514,8 @@ class AccessibilityInjector {
}
} catch (URISyntaxException e) {
// Do nothing.
+ } catch (IllegalArgumentException e) {
+ // Catch badly-formed URLs.
}
return ACCESSIBILITY_SCRIPT_INJECTION_UNDEFINED;