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

Commit 4b8b88db authored by Thierry Strudel's avatar Thierry Strudel Committed by Android (Google) Code Review
Browse files

Merge "Use apn id which contains default type when merging apns" into mnc-dev

parents 592359ae bca51fc3

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -2392,10 +2392,12 @@ public final class DcTracker extends DcTrackerBase { 
    }

    }





    private ApnSetting mergeApns(ApnSetting dest, ApnSetting src) {

    private ApnSetting mergeApns(ApnSetting dest, ApnSetting src) {

        int id = dest.id;

        ArrayList<String> resultTypes = new ArrayList<String>();

        ArrayList<String> resultTypes = new ArrayList<String>();

        resultTypes.addAll(Arrays.asList(dest.types));

        resultTypes.addAll(Arrays.asList(dest.types));

        for (String srcType : src.types) {

        for (String srcType : src.types) {

            if (resultTypes.contains(srcType) == false) resultTypes.add(srcType);

            if (resultTypes.contains(srcType) == false) resultTypes.add(srcType);

            if (srcType.equals(PhoneConstants.APN_TYPE_DEFAULT)) id = src.id;

        }

        }

        String mmsc = (TextUtils.isEmpty(dest.mmsc) ? src.mmsc : dest.mmsc);

        String mmsc = (TextUtils.isEmpty(dest.mmsc) ? src.mmsc : dest.mmsc);

        String mmsProxy = (TextUtils.isEmpty(dest.mmsProxy) ? src.mmsProxy : dest.mmsProxy);

        String mmsProxy = (TextUtils.isEmpty(dest.mmsProxy) ? src.mmsProxy : dest.mmsProxy);
@@ -2408,7 +2410,7 @@ public final class DcTracker extends DcTrackerBase { 
        int bearerBitmask = (dest.bearerBitmask == 0 || src.bearerBitmask == 0) ?

        int bearerBitmask = (dest.bearerBitmask == 0 || src.bearerBitmask == 0) ?

                0 : (dest.bearerBitmask | src.bearerBitmask);

                0 : (dest.bearerBitmask | src.bearerBitmask);





        return new ApnSetting(dest.id, dest.numeric, dest.carrier, dest.apn,

        return new ApnSetting(id, dest.numeric, dest.carrier, dest.apn,

                proxy, port, mmsc, mmsProxy, mmsPort, dest.user, dest.password,

                proxy, port, mmsc, mmsProxy, mmsPort, dest.user, dest.password,

                dest.authType, resultTypes.toArray(new String[0]), protocol,

                dest.authType, resultTypes.toArray(new String[0]), protocol,

                roamingProtocol, dest.carrierEnabled, 0, bearerBitmask, dest.profileId,

                roamingProtocol, dest.carrierEnabled, 0, bearerBitmask, dest.profileId,