Merge "Fix NPE." into mnc-dev

2015-06-10 01:06:27 +00:00
parent 53858ced4c c0cdfa5947
commit 113769d70b
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/app/AssistContent.java
+++ b/core/java/android/app/AssistContent.java
@@ -68,8 +68,10 @@ public class AssistContent {
        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);
+                }
            }
        }
    }