am a7edbbdd: am 76c5144e: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev

* commit 'a7edbbdd8dc73cb0d9e9c0726a72cfe01b5fb80f': Catch badly formed URLs in WebView accessibility injector.
2012-10-22 18:02:12 -07:00
parent be6088b6a7 a7edbbdd8d
commit b095e494b0
1 changed files with 2 additions and 0 deletions
--- 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;