summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjaekyun <jaekyun@chromium.org>2015-05-11 09:58:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-11 16:59:36 +0000
commite9785bb71f9e0b8a9a3ba321c2c6483c8805e5a1 (patch)
treecbebc54223c0517c90d90dedb770e214ca658d2c /content
parent0be1074956cd426ce8a9c5a756ab82d4637f3688 (diff)
downloadchromium_src-e9785bb71f9e0b8a9a3ba321c2c6483c8805e5a1.zip
chromium_src-e9785bb71f9e0b8a9a3ba321c2c6483c8805e5a1.tar.gz
chromium_src-e9785bb71f9e0b8a9a3ba321c2c6483c8805e5a1.tar.bz2
Catch Exception for Intent.parseUri instead of URISyntaxException
Intent.parseUri can throw other excpetions like NumberFormatException. So we need to catch Exception to avoid crash. BUG=484336 Review URL: https://codereview.chromium.org/1132473004 Cr-Commit-Position: refs/heads/master@{#329163}
Diffstat (limited to 'content')
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
index a874357..b88614f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
@@ -7,15 +7,13 @@ package org.chromium.content.browser;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
-import android.util.Log;
import android.view.ActionMode;
import android.view.KeyEvent;
import android.view.View;
+import org.chromium.base.Log;
import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
-import java.net.URISyntaxException;
-
/**
* Main callback class used by ContentView.
*
@@ -145,8 +143,8 @@ public class ContentViewClient {
// Perform generic parsing of the URI to turn it into an Intent.
try {
intent = Intent.parseUri(intentUrl, Intent.URI_INTENT_SCHEME);
- } catch (URISyntaxException ex) {
- Log.w(TAG, "Bad URI " + intentUrl + ": " + ex.getMessage());
+ } catch (Exception ex) {
+ Log.w(TAG, "Bad URI " + intentUrl, ex);
return;
}