PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ea6b5d63: am 275c1dff: am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev

Browse Source 
* commit 'ea6b5d63d9100f014cdedf438f1750ed65b822b2':
  Use ConnectivityManager for mobile provision url
This commit is contained in:
Robert Greenwalt
2013-07-19 16:02:13 -07:00
committed by Android Git Automerger
parent 3fa1658e7f ea6b5d63d9
commit ff303b4f81
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/WirelessSettings.java
View File

@@ -45,7 +45,7 @@ import com.android.settings.nfc.NfcEnabler;
import com.android.settings.NsdEnabler;
public class WirelessSettings extends SettingsPreferenceFragment {
private static final String TAG = "WirelessSettiings";
private static final String TAG = "WirelessSettings";
private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
private static final String KEY_TOGGLE_NFC = "toggle_nfc";
@@ -106,7 +106,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
NetworkInfo ni = mCm.getActiveNetworkInfo();
if (mTm.hasIccCard() && (ni != null)) {
// Get provisioning URL
String url = getProvisioningUrl();
String url = mCm.getMobileProvisioningUrl();
if (!TextUtils.isEmpty(url)) {
// Send user to provisioning webpage
Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -145,26 +145,6 @@ public class WirelessSettings extends SettingsPreferenceFragment {
}
}
private String getProvisioningUrl() {
String url = getActivity().getResources()
.getString(com.android.internal.R.string.mobile_provisioning_url);
log("getProvisioningUrl: mobile_provisioning_url=" + url);
// populate the iccid, imei and phone number in the provisioning url.
if (!TextUtils.isEmpty(url)) {
String phoneNumber = mTm.getLine1Number();
if (TextUtils.isEmpty(phoneNumber)) {
phoneNumber = "0000000000";
}
url = String.format(url,
mTm.getSimSerialNumber() /* ICCID */,
mTm.getDeviceId() /* IMEI */,
phoneNumber /* Phone number */);
}
return url;
}
@Override
public Dialog onCreateDialog(int dialogId) {
log("onCreateDialog: dialogId=" + dialogId);