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

Commit 24e76641 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Cleanup the IF statement in onReceive()" am: 68325b32 am: e139d19b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1394588

Change-Id: I87c93e73e68976dcbdbabeb300e1a23db83689d8
parents ddcd612b e139d19b

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

+4 −6
Original line number Diff line number Diff line
@@ -582,19 +582,17 @@ public class ServiceStateTracker extends Handler { 
    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction().equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {

            final String action = intent.getAction();

            if (action.equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {

                int phoneId = intent.getExtras().getInt(CarrierConfigManager.EXTRA_SLOT_INDEX);

                // Ignore the carrier config changed if the phoneId is not matched.

                if (phoneId == mPhone.getPhoneId()) {

                    sendEmptyMessage(EVENT_CARRIER_CONFIG_CHANGED);

                }

                return;

            }



            if (intent.getAction().equals(Intent.ACTION_LOCALE_CHANGED)) {

            } else if (action.equals(Intent.ACTION_LOCALE_CHANGED)) {

                // Update emergency string or operator name, polling service state.

                pollState();

            } else if (intent.getAction().equals(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED)) {

            } else if (action.equals(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED)) {

                String lastKnownNetworkCountry = intent.getStringExtra(

                        TelephonyManager.EXTRA_LAST_KNOWN_NETWORK_COUNTRY);

                if (!mLastKnownNetworkCountry.equals(lastKnownNetworkCountry)) {