Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d45afac2 authored by Diego Pontoriero's avatar Diego Pontoriero
Browse files

Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API 

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
parent f4a16350

services/core/java/com/android/server/ConnectivityService.java

+7 −4
Original line number Diff line number Diff line
@@ -3492,10 +3492,13 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            mIsProvisioningNetwork.set(false);

            // Check for  apps that can handle provisioning first

            Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);

            provisioningIntent.addCategory(TelephonyIntents.CATEGORY_MCCMNC_PREFIX

                    + mTelephonyManager.getSimOperator());

            if (mContext.getPackageManager().resolveActivity(provisioningIntent, 0 /* flags */)

                    != null) {

            List<String> carrierPackages =

                    mTelephonyManager.getCarrierPackageNamesForBroadcastIntent(provisioningIntent);

            if (carrierPackages != null && !carrierPackages.isEmpty()) {

                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 |

                        Intent.FLAG_ACTIVITY_NEW_TASK);

                mContext.startActivity(provisioningIntent);