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

Commit 5a35940b authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "address API council feedbacks for Telephony.Carriers" 

am: fefe13e7

Change-Id: Ifc47adfeb88290d4cb431acae46860b04cd21d2d
parents ca22e9c7 fefe13e7

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

+3 −3
Original line number Diff line number Diff line
@@ -1752,13 +1752,13 @@ public class DcTracker extends Handler { 
                        new String[] {Telephony.Carriers.APN_SET_ID}, null, null, null);

        if (c == null) {

            loge("getPreferredApnSetId: cursor is null");

            return Telephony.Carriers.NO_SET_SET;

            return Telephony.Carriers.NO_APN_SET_ID;

        }



        int setId;

        if (c.getCount() < 1) {

            loge("getPreferredApnSetId: no APNs found");

            setId = Telephony.Carriers.NO_SET_SET;

            setId = Telephony.Carriers.NO_APN_SET_ID;

        } else {

            c.moveToFirst();

            setId = c.getInt(0 /* index of Telephony.Carriers.APN_SET_ID */);
@@ -3466,7 +3466,7 @@ public class DcTracker extends Handler { 
    public ArrayList<ApnSetting> sortApnListByPreferred(ArrayList<ApnSetting> list) {

        if (list == null || list.size() <= 1) return list;

        int preferredApnSetId = getPreferredApnSetId();

        if (preferredApnSetId != Telephony.Carriers.NO_SET_SET) {

        if (preferredApnSetId != Telephony.Carriers.NO_APN_SET_ID) {

            list.sort(new Comparator<ApnSetting>() {

                @Override

                public int compare(ApnSetting apn1, ApnSetting apn2) {

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+5 −3
Original line number Diff line number Diff line
@@ -235,9 +235,11 @@ public class DcTrackerTest extends TelephonyTest { 
                                    Telephony.Carriers.CARRIER_ENABLED, Telephony.Carriers.BEARER,

                                    Telephony.Carriers.BEARER_BITMASK,

                                    Telephony.Carriers.PROFILE_ID,

                                    Telephony.Carriers.MODEM_COGNITIVE,

                                    Telephony.Carriers.MAX_CONNS, Telephony.Carriers.WAIT_TIME,

                                    Telephony.Carriers.MAX_CONNS_TIME, Telephony.Carriers.MTU,

                                    Telephony.Carriers.MODEM_PERSIST,

                                    Telephony.Carriers.MAX_CONNECTIONS,

                                    Telephony.Carriers.WAIT_TIME_RETRY,

                                    Telephony.Carriers.TIME_LIMIT_FOR_MAX_CONNECTIONS,

                                    Telephony.Carriers.MTU,

                                    Telephony.Carriers.MVNO_TYPE,

                                    Telephony.Carriers.MVNO_MATCH_DATA,

                                    Telephony.Carriers.NETWORK_TYPE_BITMASK,