commit 80bfbd53151eccb8888aafc81d3dccea87cdca29
author Wink Saville <wink@google.com> Fri Jul 12 18:58:56 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 18:58:56 2013 +0000
tree 6866d8c27e56352f3a155058ecda43ce4f70e9ab
parent 2a1ccab1cdd00af6989eadba1a766120d0b10243
parent b464478664df3203bfdd92cfc8c05b95c51cb0a9

Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index fde7044..f4a48ef 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -150,17 +150,18 @@
                 .getString(com.android.internal.R.string.mobile_provisioning_url);
         log("getProvisioningUrl: mobile_provisioning_url=" + url);
 
-        // populate the iccid and imei in the provisioning url.
+        // populate the iccid, imei and phone number in the provisioning url.
         if (!TextUtils.isEmpty(url)) {
-            log("getProvisioningUrl: iccid=" + mTm.getSimSerialNumber()
-                    + " imei=" + mTm.getDeviceId() + " phone number=" + mTm.getLine1Number());
+            String phoneNumber = mTm.getLine1Number();
+            if (TextUtils.isEmpty(phoneNumber)) {
+                phoneNumber = "0000000000";
+            }
             url = String.format(url,
                     mTm.getSimSerialNumber() /* ICCID */,
                     mTm.getDeviceId() /* IMEI */,
-                    mTm.getLine1Number() /* Phone number */);
+                    phoneNumber /* Phone number */);
         }
 
-        log("getProvisioningUrl: url=" + url);
         return url;
     }