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

Commit 893acc49 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Existing APN profile is incorrectly getting merged"

parents 4f3e1531 16533728

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

+16 −14
Original line number Diff line number Diff line
@@ -3419,20 +3419,22 @@ public class DcTracker extends Handler { 


    // Check if neither mention DUN and are substantially similar

    private boolean apnsSimilar(ApnSetting first, ApnSetting second) {

        return (first.canHandleType(PhoneConstants.APN_TYPE_DUN) == false &&

                second.canHandleType(PhoneConstants.APN_TYPE_DUN) == false &&

                Objects.equals(first.apn, second.apn) &&

                !apnTypeSameAny(first, second) &&

                xorEquals(first.proxy, second.proxy) &&

                xorEquals(first.port, second.port) &&

                first.carrierEnabled == second.carrierEnabled &&

                first.bearerBitmask == second.bearerBitmask &&

                first.profileId == second.profileId &&

                Objects.equals(first.mvnoType, second.mvnoType) &&

                Objects.equals(first.mvnoMatchData, second.mvnoMatchData) &&

                xorEquals(first.mmsc, second.mmsc) &&

                xorEquals(first.mmsProxy, second.mmsProxy) &&

                xorEquals(first.mmsPort, second.mmsPort));

        return (!first.canHandleType(PhoneConstants.APN_TYPE_DUN)

                && !second.canHandleType(PhoneConstants.APN_TYPE_DUN)

                && Objects.equals(first.apn, second.apn)

                && !apnTypeSameAny(first, second)

                && xorEquals(first.proxy, second.proxy)

                && xorEquals(first.port, second.port)

                && xorEquals(first.protocol, second.protocol)

                && xorEquals(first.roamingProtocol, second.roamingProtocol)

                && first.carrierEnabled == second.carrierEnabled

                && first.bearerBitmask == second.bearerBitmask

                && first.profileId == second.profileId

                && Objects.equals(first.mvnoType, second.mvnoType)

                && Objects.equals(first.mvnoMatchData, second.mvnoMatchData)

                && xorEquals(first.mmsc, second.mmsc)

                && xorEquals(first.mmsProxy, second.mmsProxy)

                && xorEquals(first.mmsPort, second.mmsPort));

    }



    // equal or one is not specified