Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 113769d7: Merge "Fix NPE." into mnc-dev

Browse Source 
* commit '113769d70b2221697ad9a9553da68ec6483cbfa1':
  Fix NPE.
This commit is contained in:
Dianne Hackborn
2015-06-10 01:16:41 +00:00
committed by Android Git Automerger
parent a390a202d2 113769d70b
commit 4f8fdd9332
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/AssistContent.java
View File

@@ -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);
}
}
}
}