Merge "Fix NPE caused by Change I4df27119." into gingerbread (07e1be62) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -5268,13 +5268,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) {