LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev

Browse Source
This commit is contained in:
Diego Pontoriero
2014-08-20 23:53:11 +00:00
committed by Android (Google) Code Review
parent cbec2b12ca 15e645e0fe
commit b0b5d7eb83
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3490,10 +3490,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mIsProvisioningNetwork.set(false); mIsProvisioningNetwork.set(false);
// Check for apps that can handle provisioning first // Check for apps that can handle provisioning first
Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP); Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);
provisioningIntent.addCategory(TelephonyIntents.CATEGORY_MCCMNC_PREFIX List<String> carrierPackages =
+ mTelephonyManager.getSimOperator()); mTelephonyManager.getCarrierPackageNamesForBroadcastIntent(provisioningIntent);
if (mContext.getPackageManager().resolveActivity(provisioningIntent, 0 /* flags */) if (carrierPackages != null && !carrierPackages.isEmpty()) {
!= null) { if (carrierPackages.size() != 1) {
if (DBG) log("Multiple matching carrier apps found, launching the first.");
}
provisioningIntent.setPackage(carrierPackages.get(0));
provisioningIntent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | provisioningIntent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT |
Intent.FLAG_ACTIVITY_NEW_TASK); Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(provisioningIntent); mContext.startActivity(provisioningIntent);