am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
This commit is contained in:
Wink Saville
2013-07-12 12:03:54 -07:00
committed by Android Git Automerger

View File

@@ -150,17 +150,18 @@ public class WirelessSettings extends SettingsPreferenceFragment {
.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;
}