commit 07e1be62c7a8650313e7ad8690968c58ec8e88ad
author Wink Saville <wink@google.com> Wed Oct 13 12:17:05 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 13 12:17:05 2010 -0700
tree dfadc428e68face8b0747cc87c83493df578088e
parent eb4ef07223030eb61d8cf99771e657b7fc0108d0
parent c491ee02237fc5c0e6a4ad81ebc899d97c9778b5

Merge "Fix NPE caused by Change I4df27119." into gingerbread

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 7242803..de8e3f4 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -5268,10 +5268,15 @@
             }
             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);
             }