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

Commit f066f841 authored by Shareef Ali's avatar Shareef Ali Committed by Gerrit Code Review
Browse files

Merge "DCTracker: if cdma sim is not avaliable, load from predefined property... 

Merge "DCTracker: if cdma sim is not avaliable, load from predefined property from build.prop" into cm-11.0
parents 5c0b0115 ac0890fe

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

+10 −2
Original line number Diff line number Diff line
@@ -2025,7 +2025,11 @@ public final class DcTracker extends DcTrackerBase { 
    private void createAllApnList() {

        mAllApnSettings = new ArrayList<ApnSetting>();

        IccRecords r = mIccRecords.get();

        String operator = (r != null) ? r.getOperatorNumeric() : "";

        String homeOperator = "";

        if (isNvSubscription()){

            homeOperator = SystemProperties.get("ro.cdma.home.operator.numeric");

        }

        String operator = (r != null) ? r.getOperatorNumeric() : homeOperator;

        if (operator != null) {

            String selection = "numeric = '" + operator + "'";

            // query only enabled apn.
@@ -2110,7 +2114,11 @@ public final class DcTracker extends DcTrackerBase { 
        }



        IccRecords r = mIccRecords.get();

        String operator = (r != null) ? r.getOperatorNumeric() : "";

        String homeOperator = "";

        if (isNvSubscription()){

            homeOperator = SystemProperties.get("ro.cdma.home.operator.numeric");

        }

        String operator = (r != null) ? r.getOperatorNumeric() : homeOperator;



        // This is a workaround for a bug (7305641) where we don't failover to other

        // suitable APNs if our preferred APN fails.  On prepaid ATT sims we need to