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

Commit b951ba66 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Reload APNs setting page when receive the intent... 

Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am: 5b7535d5

Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
parents 188272e1 5b7535d5

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

+11 −5
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements 


    private String mSelectedKey;



    private IntentFilter mMobileStateFilter;

    private IntentFilter mIntentFilter;



    private boolean mUnavailable;
@@ -121,7 +121,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
        super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);

    }



    private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {

    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction().equals(
@@ -136,6 +136,11 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
                    }

                    break;

                }

            } else if(intent.getAction().equals(

                    TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED)) {

                if (!mRestoreDefaultApnMode) {

                    fillList();

                }

            }

        }

    };
@@ -161,8 +166,9 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
        final int subId = activity.getIntent().getIntExtra(SUB_ID,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);



        mMobileStateFilter = new IntentFilter(

        mIntentFilter = new IntentFilter(

                TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

        mIntentFilter.addAction(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);



        setIfOnlyAvailableForAdmins(true);
@@ -209,7 +215,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
            return;

        }



        getActivity().registerReceiver(mMobileStateReceiver, mMobileStateFilter);

        getActivity().registerReceiver(mReceiver, mIntentFilter);



        if (!mRestoreDefaultApnMode) {

            fillList();
@@ -224,7 +230,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
            return;

        }



        getActivity().unregisterReceiver(mMobileStateReceiver);

        getActivity().unregisterReceiver(mReceiver);

    }



    @Override