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

Commit c491ee02 authored by Wink Saville's avatar Wink Saville
Browse files

Fix NPE caused by Change I4df27119. 

This change caused Music APP to throw an NPE the fix
is to test that scheme is not null before using it.

Bug: 3092886
Change-Id: Ib29f944cbd9a9ff628462bdd6f4b68a308468536
parent e22eb863

core/java/android/content/Intent.java

+9 −4
Original line number Original line Diff line number Diff line
@@ -5268,13 +5268,18 @@ public class Intent implements Parcelable, Cloneable { 
            }

            }

            first = false;

            first = false;

            b.append("dat=");

            b.append("dat=");

            if (mData.getScheme().equalsIgnoreCase("tel")) {

            String scheme = mData.getScheme();

            if (scheme != null) {

                if (scheme.equalsIgnoreCase("tel")) {

                    b.append("tel:xxx-xxx-xxxx");

                    b.append("tel:xxx-xxx-xxxx");

            } else if (mData.getScheme().equalsIgnoreCase("smsto")) {

                } else if (scheme.equalsIgnoreCase("smsto")) {

                    b.append("smsto:xxx-xxx-xxxx");

                    b.append("smsto:xxx-xxx-xxxx");

                } else {

                } else {

                    b.append(mData);

                    b.append(mData);

                }

                }

            } else {

                b.append(mData);

            }

        }

        }

        if (mType != null) {

        if (mType != null) {

            if (!first) {

            if (!first) {