diff options
| author | Grace Kloba <klobag@google.com> | 2009-10-01 11:37:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-01 11:37:20 -0700 |
| commit | 160f9f2a0fcf7e5f93bed58238c750b444aaeb9d (patch) | |
| tree | 8d9cecc84daffcc81e63dfbddd728b556f2bcc87 | |
| parent | c33699b0c7a141965e05f0dd3642ef1fc66958b8 (diff) | |
| parent | 1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd (diff) | |
| download | packages_apps_browser-160f9f2a0fcf7e5f93bed58238c750b444aaeb9d.zip packages_apps_browser-160f9f2a0fcf7e5f93bed58238c750b444aaeb9d.tar.gz packages_apps_browser-160f9f2a0fcf7e5f93bed58238c750b444aaeb9d.tar.bz2 | |
am 1fb12a7a: am 1e705056: Check null for intent.getData() before using it.
Merge commit '1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd'
* commit '1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd':
Check null for intent.getData() before using it.
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class BrowserActivity extends Activity 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)) { |