diff options
author | Diego Pontoriero <diegs@google.com> | 2014-08-11 18:25:51 -0700 |
---|---|---|
committer | Diego Pontoriero <diegs@google.com> | 2014-08-20 16:44:46 -0700 |
commit | ff9f67dddd97756dffe2059aa186acd29fc67527 (patch) | |
tree | d788f790572589a38b716f21427abfad8dbe3a63 /src/com/android/settings/WirelessSettings.java | |
parent | 735219be8f85bd1ad41ab91834e5a427bb2ae7fc (diff) | |
download | packages_apps_Settings-ff9f67dddd97756dffe2059aa186acd29fc67527.zip packages_apps_Settings-ff9f67dddd97756dffe2059aa186acd29fc67527.tar.gz packages_apps_Settings-ff9f67dddd97756dffe2059aa186acd29fc67527.tar.bz2 |
Change CARRIER_SETUP hook in WirelessSettings to use aeroshell
for determining carrier app instead of MCC/MNC.
Related WirelessSettings change: http://ag/374330
Related Aeroshell change to SetupWizard: http://ag/520857
Bug: 16457806
Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
-rw-r--r-- | src/com/android/settings/WirelessSettings.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index b256f94..ce3164d 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -129,9 +129,13 @@ public class WirelessSettings extends SettingsPreferenceFragment 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) { + List<String> carrierPackages = + mTm.getCarrierPackageNamesForBroadcastIntent(provisioningIntent); + if (carrierPackages != null && !carrierPackages.isEmpty()) { + if (carrierPackages.size() != 1) { + Log.w(TAG, "Multiple matching carrier apps found, launching the first."); + } + provisioningIntent.setPackage(carrierPackages.get(0)); startActivity(provisioningIntent); return; } |