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

Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API

Browse Source 
for determining carrier app instead of MCC/MNC.

Related ConnectivityService change: http://ag/374479

Related Aeroshell change to SetupWizard: http://ag/520857

Bug: 16457806
Change-Id: I78eb2a25d578400c2de6bae4af3d6e8e1ee4d0c7
This commit is contained in:
Diego Pontoriero
2014-08-11 18:36:58 -07:00
parent 0aef9341d3
commit 15e645e0fe
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

@@ -3492,10 +3492,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);