am ef942e8a: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit 'ef942e8a55':
  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:14:01 -07:00 • committed by Android Git Automerger
commit a77b479408

View file

@ -3986,17 +3986,20 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private String getProvisioningUrl() {
String url = mContext.getResources().getString(R.string.mobile_provisioning_url);
log("getProvisioningUrl: resource url=" + 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)) {
String phoneNumber = mTelephonyManager.getLine1Number();
if (TextUtils.isEmpty(phoneNumber)) {
phoneNumber = "0000000000";
}
url = String.format(url,
mTelephonyManager.getSimSerialNumber() /* ICCID */,
mTelephonyManager.getDeviceId() /* IMEI */,
mTelephonyManager.getLine1Number() /* Phone numer */);
phoneNumber /* Phone numer */);
}
log("getProvisioningUrl: url=" + url);
return url;
}
}