Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 113769d7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE." into mnc-dev

parents 53858ced c0cdfa59

core/java/android/app/AssistContent.java

+4 −2
Original line number Diff line number Diff line
@@ -68,11 +68,13 @@ public class AssistContent { 
        setWebUri(null);

        if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {

            Uri uri = intent.getData();

            if (uri != null) {

                if ("http".equals(uri.getScheme()) || "https".equals(uri.getScheme())) {

                    setWebUri(uri);

                }

            }

        }

    }



    /**

     * Sets the Intent associated with the content, describing the current top-level context of