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

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

Browse Source 
Merge commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp

* commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad':
  Fix NPE caused by Change I4df27119.
This commit is contained in:
Wink Saville
2010-10-13 12:27:22 -07:00
committed by Android Git Automerger
parent 5cfa877e22 07e1be62c7
commit 94980e0f76
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/Intent.java
View File

@@ -5268,10 +5268,15 @@ public class Intent implements Parcelable, Cloneable {
}
first = false;
b.append("dat=");
if (mData.getScheme().equalsIgnoreCase("tel")) {
b.append("tel:xxx-xxx-xxxx");
} else if (mData.getScheme().equalsIgnoreCase("smsto")) {
b.append("smsto:xxx-xxx-xxxx");
String scheme = mData.getScheme();
if (scheme != null) {
if (scheme.equalsIgnoreCase("tel")) {
b.append("tel:xxx-xxx-xxxx");
} else if (scheme.equalsIgnoreCase("smsto")) {
b.append("smsto:xxx-xxx-xxxx");
} else {
b.append(mData);
}
} else {
b.append(mData);
}