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

Commit 74f61fe1 authored by c_cbing's avatar c_cbing Committed by Steve Kondik
Browse files

Fix the NullPointerException when building APN list. 

Sometimes the APN is setted incorrectly and the
mPreferredDp.numeric is null,so check it whether
null before using it.

Change-Id: If7f39263833abf2fa6d426794c0efc68d7a0a244
CRs-Fixed: 674527
parent 157b4d28

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

100644 → 100755
+1 −1
Original line number Original line Diff line number Diff line
@@ -2505,7 +2505,7 @@ public final class DcTracker extends DcTrackerBase { 
                log("buildWaitingApns: Preferred APN:" + operator + ":"

                log("buildWaitingApns: Preferred APN:" + operator + ":"

                        + mPreferredApn.numeric + ":" + mPreferredApn);

                        + mPreferredApn.numeric + ":" + mPreferredApn);

            }

            }

            if (mPreferredApn.numeric.equals(operator)) {

            if (mPreferredApn.numeric != null && mPreferredApn.numeric.equals(operator)) {

                if (mPreferredApn.bearer == 0 || mPreferredApn.bearer == radioTech) {

                if (mPreferredApn.bearer == 0 || mPreferredApn.bearer == radioTech) {

                    apnList.add(mPreferredApn);

                    apnList.add(mPreferredApn);

                    if (DBG) log("buildWaitingApns: X added preferred apnList=" + apnList);

                    if (DBG) log("buildWaitingApns: X added preferred apnList=" + apnList);