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

Commit 1fec2132 authored by Daniel Huang's avatar Daniel Huang Committed by android-build-merger
Browse files

Merge "In sim1 APN settings interface and hot plug out/in sim2, APN... 

Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb7775
am: f28625bc

Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
parents b2671194 f28625bc

src/com/android/settings/network/ApnSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ public class ApnSettings extends RestrictedSettingsFragment 
    private HandlerThread mRestoreDefaultApnThread;

    private SubscriptionInfo mSubscriptionInfo;

    private int mSubId;

    private int mPhoneId;

    private UiccController mUiccController;

    private String mMvnoType;

    private String mMvnoMatchData;
@@ -151,7 +152,9 @@ public class ApnSettings extends RestrictedSettingsFragment 
                if (!mRestoreDefaultApnMode) {

                    int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,

                            SubscriptionManager.INVALID_SUBSCRIPTION_ID);

                    if (extraSubId != mSubId) {

                    if (SubscriptionManager.isValidSubscriptionId(extraSubId) &&

                            mPhoneId == SubscriptionManager.getPhoneId(extraSubId) &&

                            extraSubId != mSubId) {

                        // subscription has changed

                        mSubId = extraSubId;

                        mSubscriptionInfo = getSubscriptionInfo(mSubId);
@@ -182,7 +185,7 @@ public class ApnSettings extends RestrictedSettingsFragment 
        final Activity activity = getActivity();

        mSubId = activity.getIntent().getIntExtra(SUB_ID,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);



        mPhoneId = SubscriptionManager.getPhoneId(mSubId);

        mIntentFilter = new IntentFilter(

                TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

        mIntentFilter.addAction(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);