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

Commit b079a106 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread 

Merge commit '94980e0f'

* commit '94980e0f':
  Fix NPE caused by Change I4df27119.
parents a8d25065 94980e0f

core/java/android/content/Intent.java

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

            first = false;

            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");

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

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

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

                } else {

                    b.append(mData);

                }

            } else {

                b.append(mData);

            }

        }

        if (mType != null) {

            if (!first) {