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

Check for presence of carrier app in Mobile Plan.

Browse Source 
When the user chooses Mobile Plan in Settings, first do a check to see if
a valid carrier app for the current MCC/MNC exists. If so, launch that app
instead of checking for a provisioning URL or hoping for a DNS redirect in
the browser. If no such app exists, continue on as normal.

Bug: 9623212
Change-Id: I81538063d4cdd147948a83ffc0c2641174ba9001
This commit is contained in:
Andrew Flynn
2013-10-11 09:06:22 -07:00
parent b05be5fe0f
commit 17c008e9d0
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,7 @@ public class WirelessSettings extends RestrictedSettingsFragment
private ConnectivityManager mCm;
private TelephonyManager mTm;
private PackageManager mPm;
private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
@@ -124,6 +125,15 @@ public class WirelessSettings extends RestrictedSettingsFragment
NetworkInfo ni = mCm.getProvisioningOrActiveNetworkInfo();
if (mTm.hasIccCard() && (ni != null)) {
// Check for carrier apps that can handle provisioning first
Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);
provisioningIntent.addCategory(TelephonyIntents.CATEGORY_MCCMNC_PREFIX
+ mTm.getSimOperator());
if (mPm.resolveActivity(provisioningIntent, 0 /* flags */) != null) {
startActivity(provisioningIntent);
return;
}
// Get provisioning URL
String url = mCm.getMobileProvisioningUrl();
if (!TextUtils.isEmpty(url)) {
@@ -192,15 +202,14 @@ public class WirelessSettings extends RestrictedSettingsFragment
CharSequence[] entryValues = new CharSequence[count];
Drawable[] entryImages = new Drawable[count];
PackageManager packageManager = getPackageManager();
int i = 0;
for (SmsApplicationData smsApplicationData : smsApplications) {
entries[i] = smsApplicationData.mApplicationName;
entryValues[i] = smsApplicationData.mPackageName;
try {
entryImages[i] = packageManager.getApplicationIcon(smsApplicationData.mPackageName);
entryImages[i] = mPm.getApplicationIcon(smsApplicationData.mPackageName);
} catch (NameNotFoundException e) {
entryImages[i] = packageManager.getDefaultActivityIcon();
entryImages[i] = mPm.getDefaultActivityIcon();
}
i++;
}
@@ -260,6 +269,7 @@ public class WirelessSettings extends RestrictedSettingsFragment
mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mTm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
mPm = getPackageManager();
addPreferencesFromResource(R.xml.wireless_settings);
@@ -342,7 +352,7 @@ public class WirelessSettings extends RestrictedSettingsFragment
}
// Remove Airplane Mode settings if it's a stationary device such as a TV.
if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
if (mPm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
removePreference(KEY_TOGGLE_AIRPLANE);
}
@@ -370,8 +380,7 @@ public class WirelessSettings extends RestrictedSettingsFragment
com.android.internal.R.bool.config_cellBroadcastAppLinks);
try {
if (isCellBroadcastAppLinkEnabled) {
PackageManager pm = getPackageManager();
if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
if (mPm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
== PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
isCellBroadcastAppLinkEnabled = false; // CMAS app disabled
}