am f1077df4: am 5baac25e: Merge "Log an error when no activity is found to handle a URL."

* commit 'f1077df463b0792dc9285286071b64f64ddbb623':
  Log an error when no activity is found to handle a URL.

1 files changed, 13 insertions, 8 deletions

diff --git a/src/com/android/browser/UrlHandler.java b/src/com/android/browser/UrlHandler.java
index 207ada6..084a479 100644
--- a/src/com/android/browser/UrlHandler.java
+++ b/src/com/android/browser/UrlHandler.java
@@ -150,14 +150,19 @@ public class UrlHandler {
               intent = new Intent(Intent.ACTION_VIEW, Uri
                       .parse("market://search?q=pname:" + packagename));
               intent.addCategory(Intent.CATEGORY_BROWSABLE);
-              mActivity.startActivity(intent);
-              // before leaving BrowserActivity, close the empty child tab.
-              // If a new tab is created through JavaScript open to load this
-              // url, we would like to close it as we will load this url in a
-              // different Activity.
-              mController.closeEmptyTab();
-              return true;
-          } else {
+              try {
+                  mActivity.startActivity(intent);
+                  // before leaving BrowserActivity, close the empty child tab.
+                  // If a new tab is created through JavaScript open to load this
+                  // url, we would like to close it as we will load this url in a
+                  // different Activity.
+                  mController.closeEmptyTab();
+                  return true;
+              } catch (ActivityNotFoundException e) {
+                  Log.w("Browser", "No activity found to handle " + url);
+                  return false;
+              }
+            } else {
               return false;
           }
       }