diff options
| -rw-r--r-- | core/java/android/app/AssistContent.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/AssistContent.java b/core/java/android/app/AssistContent.java index d23e73dfe33f..173b23725baa 100644 --- 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); + } } } } |