commit 1e70505659dd9bf0f7e03bce787ba880f9b7a8aa
author Grace Kloba <klobag@google.com> Tue Sep 29 13:13:36 2009 -0700
committer Grace Kloba <klobag@google.com> Tue Sep 29 14:22:37 2009 -0700
tree 90cf9d8905e972e8c2f114b84a9338ce5af586fa
parent 380ac10b1c694f791fa75b6f29493954b2596bd8

Check null for intent.getData() before using it.

Fix http://b/issue?id=2151485

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index d0ebc8b..6797841 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -613,7 +613,8 @@
         String url = null;
         final String action = intent.getAction();
         if (Intent.ACTION_VIEW.equals(action)) {
-            url = intent.getData().toString();
+            Uri data = intent.getData();
+            if (data != null) url = data.toString();
         } else if (Intent.ACTION_SEARCH.equals(action)
                 || MediaStore.INTENT_ACTION_MEDIA_SEARCH.equals(action)
                 || Intent.ACTION_WEB_SEARCH.equals(action)) {