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

Commit 7ae2ec0f authored by SongFerngWang's avatar SongFerngWang Committed by SongFerng Wang
Browse files

Avoid AllowedNetworkTypesListener NullPointerException. 

If the CarrierServiceStateTracker's AllowedNetworkTypesListener
registers than radio power on, it gets the empty map. the map
gets null and then casues NullPointerException.
It is timeing issus, so add the protection on it.

Bug: 178443299
Test: atest CarrierServiceStateTrackerTest
Change-Id: Ia43f0117a2e1e573730554d878e9ce4cf9acad91
parent 21fa4dfe

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) {