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

Commit 42a600e8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "unused" 

* changes:
  Added set MCC, MNC, country code support
  Added addSubInfo support
  Added subscription info conversion method
  Removed unused method
  Notify subscription info changed
parents 67fe8174 c66a5f80

src/java/com/android/internal/telephony/CarrierResolver.java

+7 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.util.Log; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.metrics.CarrierIdMatchStats;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.subscription.SubscriptionManagerService;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.util.TelephonyUtils;
@@ -547,9 +548,14 @@ public class CarrierResolver extends Handler { 
        // subscriptioninfo db to make sure we have correct carrier id set.

        if (SubscriptionManager.isValidSubscriptionId(mPhone.getSubId()) && !isSimOverride) {

            // only persist carrier id to simInfo db when subId is valid.

            if (mPhone.isSubscriptionManagerServiceEnabled()) {

                SubscriptionManagerService.getInstance().setCarrierId(mPhone.getSubId(),

                        mCarrierId);

            } else {

                SubscriptionController.getInstance().setCarrierId(mCarrierId, mPhone.getSubId());

            }

        }

    }



    private static CarrierMatchingRule makeCarrierMatchingRule(Cursor cursor) {

        String certs = cursor.getString(

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+23 −12
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import com.android.internal.telephony.imsphone.ImsPhoneCallTracker; 
import com.android.internal.telephony.imsphone.ImsPhoneMmiCode;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.metrics.VoiceCallSessionStats;

import com.android.internal.telephony.subscription.SubscriptionManagerService.SubscriptionManagerServiceCallback;

import com.android.internal.telephony.test.SimulatedRadioControl;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;

import com.android.internal.telephony.uicc.IccCardStatus;
@@ -340,8 +341,18 @@ public class GsmCdmaPhone extends Phone { 
        mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null);

        mSST.registerForVoiceRegStateOrRatChanged(this, EVENT_VRS_OR_RAT_CHANGED, null);



        if (isSubscriptionManagerServiceEnabled()) {

            mSubscriptionManagerService.registerCallback(new SubscriptionManagerServiceCallback(

                    this::post) {

                @Override

                public void onUiccApplicationsEnabled(int subId) {

                    reapplyUiccAppsEnablementIfNeeded(ENABLE_UICC_APPS_MAX_RETRIES);

                }

            });

        } else {

            SubscriptionController.getInstance().registerForUiccAppsEnabled(this,

                    EVENT_UICC_APPS_ENABLEMENT_SETTING_CHANGED, null, false);

        }



        mLinkBandwidthEstimator = mTelephonyComponentFactory

                .inject(LinkBandwidthEstimator.class.getName())
@@ -495,7 +506,11 @@ public class GsmCdmaPhone extends Phone { 
                logd("update icc_operator_numeric=" + operatorNumeric);

                tm.setSimOperatorNumericForPhone(mPhoneId, operatorNumeric);



                if (isSubscriptionManagerServiceEnabled()) {

                    mSubscriptionManagerService.setMccMnc(getSubId(), operatorNumeric);

                } else {

                    SubscriptionController.getInstance().setMccMnc(operatorNumeric, getSubId());

                }



                // Sets iso country property by retrieving from build-time system property

                String iso = "";
@@ -507,7 +522,11 @@ public class GsmCdmaPhone extends Phone { 


                logd("init: set 'gsm.sim.operator.iso-country' to iso=" + iso);

                tm.setSimCountryIsoForPhone(mPhoneId, iso);

                if (isSubscriptionManagerServiceEnabled()) {

                    mSubscriptionManagerService.setCountryIso(getSubId(), iso);

                } else {

                    SubscriptionController.getInstance().setCountryIso(iso, getSubId());

                }



                // Updates MCC MNC device configuration information

                logd("update mccmnc=" + operatorNumeric);
@@ -907,14 +926,6 @@ public class GsmCdmaPhone extends Phone { 
        }

    }



    @Override

    public void dispose() {

        // Note: this API is currently never called. We are defining actions here in case

        // we need to dispose GsmCdmaPhone/Phone object.

        super.dispose();

        SubscriptionController.getInstance().unregisterForUiccAppsEnabled(this);

    }



    @Override

    public void enableEnhancedVoicePrivacy(boolean enable, Message onComplete) {

        if (isPhoneTypeGsm()) {

src/java/com/android/internal/telephony/MultiSimSettingController.java

+6 −8
Original line number Diff line number Diff line
@@ -439,14 +439,12 @@ public class MultiSimSettingController extends Handler { 
        // being specified in it. So here we do additional check to make sur we don't miss the

        // subId.

        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            int[] subIds = mSubController.getSubIds(phoneId);

            if (!ArrayUtils.isEmpty(subIds)) {

                CarrierConfigManager cm = (CarrierConfigManager) mContext.getSystemService(

                        mContext.CARRIER_CONFIG_SERVICE);

                if (cm != null && cm.getConfigForSubId(subIds[0]) != null) {

                    loge("onCarrierConfigChanged with invalid subId while subd "

                            + subIds[0] + " is active and its config is loaded");

                    subId = subIds[0];

            subId = mSubController.getSubId(phoneId);

            if (SubscriptionManager.isValidSubscriptionId(subId)) {

                CarrierConfigManager cm = mContext.getSystemService(CarrierConfigManager.class);

                if (cm != null && cm.getConfigForSubId(subId) != null) {

                    loge("onCarrierConfigChanged with invalid subId while subId "

                            + subId + " is active and its config is loaded");

                }

            }

        }

src/java/com/android/internal/telephony/Phone.java

+5 −0
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    protected final Context mContext;



    protected SubscriptionManagerService mSubscriptionManagerService;



    /**

     * PhoneNotifier is an abstraction for all system-wide

     * state change notification. DefaultPhoneNotifier is
@@ -609,6 +611,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 


        mIsSubscriptionManagerServiceEnabled = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_using_subscription_manager_service);

        if (isSubscriptionManagerServiceEnabled()) {

            mSubscriptionManagerService = SubscriptionManagerService.getInstance();

        }



        // Initialize device storage and outgoing SMS usage monitors for SMSDispatchers.

        mTelephonyComponentFactory = telephonyComponentFactory;

src/java/com/android/internal/telephony/PhoneFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ public class PhoneFactory { 
                if (sContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_using_subscription_manager_service)) {

                    Rlog.i(LOG_TAG, "Creating SubscriptionManagerService");

                    sSubscriptionManagerService = new SubscriptionManagerService(context);

                    sSubscriptionManagerService = new SubscriptionManagerService(context,

                            Looper.myLooper());

                } else {

                    Rlog.i(LOG_TAG, "Creating SubscriptionController");

                    TelephonyComponentFactory.getInstance().inject(SubscriptionController.class