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

Commit 8780512c authored by Sungmin Choi's avatar Sungmin Choi Committed by Abhisek Devkota
Browse files

Add getPreferredApn() in buildWaitingApns() 

Now, only createAllApnList() calls getPreferredApn().
Unfortunately, in this time, getSubId() may not be proper value.
So getPreferredApn() could not get value which we want/set as preferred apn.
As a result, preferred apn is null and wrong apn info can be sent to modem
and be used by SETUP_DATA_CALL procedure.
To resolve this, just add getPreferredApn() in buildWaitingApns().

Bug: 22159434
Change-Id: Iee92325aa91c5c470328055746c321065a9829d4

Fixed that phone service crashed during boot up issue.

bug: 22357173
CYNGNOS-1415
Change-Id: I3b76a74c698e22c887b3482a3bdcbc34982ec658
(cherry picked from commit f1cd40bd)
parent 659df0ef

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

+6 −3
Original line number Diff line number Diff line
@@ -2838,6 +2838,9 @@ public final class DcTracker extends DcTrackerBase { 
            if (DBG) log("buildWaitingApns: usePreferred NotFoundException set to true");

            usePreferred = true;

        }

        if (usePreferred) {

            mPreferredApn = getPreferredApn();

        }

        if (DBG) {

            log("buildWaitingApns: usePreferred=" + usePreferred

                    + " canSetPreferApn=" + mCanSetPreferApn
@@ -2889,7 +2892,7 @@ public final class DcTracker extends DcTrackerBase { 
                }

            }

        } else {

            loge("mAllApnSettings is empty!");

            loge("mAllApnSettings is null!");

        }

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

        return apnList;
@@ -2932,8 +2935,8 @@ public final class DcTracker extends DcTrackerBase { 
    }



    private ApnSetting getPreferredApn() {

        if (mAllApnSettings.isEmpty()) {

            log("getPreferredApn: X not found mAllApnSettings.isEmpty");

        if (mAllApnSettings == null || mAllApnSettings.isEmpty()) {

            log("getPreferredApn: mAllApnSettings is " + ((mAllApnSettings == null)?"null":"empty"));

            return null;

        }