commit 113769d70b2221697ad9a9553da68ec6483cbfa1
author Dianne Hackborn <hackbod@google.com> Wed Jun 10 01:06:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 01:06:29 2015 +0000
tree b82c37f26f89535a53ab4c6d0b4ff7a498803a51
parent 53858ced4cfe4717d90b298e7fb4ffa18effcfcf
parent c0cdfa59473b7f3e225029b72b66c826639858be

Merge "Fix NPE." into mnc-dev

core/java/android/app/AssistContent.java

diff --git a/core/java/android/app/AssistContent.java b/core/java/android/app/AssistContent.java
index d23e73d..173b237 100644
--- a/core/java/android/app/AssistContent.java
+++ b/core/java/android/app/AssistContent.java
@@ -68,8 +68,10 @@
         setWebUri(null);
         if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri uri = intent.getData();
-            if ("http".equals(uri.getScheme()) || "https".equals(uri.getScheme())) {
-                setWebUri(uri);
+            if (uri != null) {
+                if ("http".equals(uri.getScheme()) || "https".equals(uri.getScheme())) {
+                    setWebUri(uri);
+                }
             }
         }
     }