Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev

erin rosenthal · Android (Google) Code Review · commit 36425d19fc57 · 2012-10-22T17:53:27.000-07:00
diff --git a/core/java/android/webkit/AccessibilityInjector.java b/core/java/android/webkit/AccessibilityInjector.java
@@ -514,6 +514,8 @@ private int getAxsUrlParameterValue(String url) {
             }
         } catch (URISyntaxException e) {
             // Do nothing.
+        } catch (IllegalArgumentException e) {
+            // Catch badly-formed URLs.
         }
 
         return ACCESSIBILITY_SCRIPT_INJECTION_UNDEFINED;

Original file line number	Diff line number	Diff line change
`@@ -514,6 +514,8 @@ private int getAxsUrlParameterValue(String url) {`
`514`	`514`	`}`
`515`	`515`	`} catch (URISyntaxException e) {`
`516`	`516`	`// Do nothing.`
	`517`	`+ } catch (IllegalArgumentException e) {`
	`518`	`+ // Catch badly-formed URLs.`
`517`	`519`	`}`
`518`	`520`
`519`	`521`	`return ACCESSIBILITY_SCRIPT_INJECTION_UNDEFINED;`