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

Commit 9b108009 authored by John Wang's avatar John Wang
Browse files

Check watingApns before access it. 

bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
parent 20398fac

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+8 −2
Original line number Diff line number Diff line
@@ -1848,8 +1848,14 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
            DataConnection dc = apnContext.getDataConnection();



            if (DBG) {

                log(String.format("onDataSetupComplete: success apn=%s",

                    apnContext.getWaitingApns().get(0).apn));

                // TODO We may use apnContext.getApnSetting() directly

                // instead of getWaitingApns().get(0)

                String apnStr = "<unknown>";

                if (apnContext.getWaitngApns() != null

                        && !apnContext.getWatingApns().isEmpty()){

                    apnStr = apnContext.getWaitingApns().get(0).apn;

                }

                log("onDataSetupComplete: success apn=" + apnStr);

            }

            ApnSetting apn = apnContext.getApnSetting();

            if (apn.proxy != null && apn.proxy.length() != 0) {