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

Commit 4d7dd6a1 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Avoid AllowedNetworkTypesListener NullPointerException." am: ff7cbeff am: f0ff1c45 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51606185a05865a016cd3a5e91f885e75f05f227
parents 5f6d6be6 f0ff1c45

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

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ public class CarrierServiceStateTracker extends Handler { 
            implements PhoneStateListener.AllowedNetworkTypesChangedListener {

        @Override

        public void onAllowedNetworkTypesChanged(Map<Integer, Long> allowedNetworkTypesList) {

            if (!allowedNetworkTypesList.containsKey(

                    TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER)) {

                return;

            }



            long newAllowedNetworkType = allowedNetworkTypesList.get(

                    TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER);

            if (mAllowedNetworkType != newAllowedNetworkType) {