Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97b077bc authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if... 

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

* commit '42a85412':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
parents 8361a9f7 42a85412

services/java/com/android/server/ConnectivityService.java

+7 −4
Original line number Diff line number Diff line
@@ -3975,17 +3975,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;

    }

}