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

Commit 5b7c7586 authored by Amruth Ramachandran's avatar Amruth Ramachandran Committed by Automerger Merge Worker
Browse files

Merge "Fixed the incorrect APN dedupling" into tm-dev am: 809036e6 am: 3c50aad3 am: 6825dd91 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17947552



Change-Id: I5ef22dcf4788e5936a2c6cca3c3b993227db4cc2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 927605a4 6825dd91

telephony/java/android/telephony/data/ApnSetting.java

+8 −3
Original line number Diff line number Diff line
@@ -1293,8 +1293,8 @@ public class ApnSetting implements Parcelable { 
                && Objects.equals(this.mOperatorNumeric, other.mOperatorNumeric)

                && Objects.equals(this.mProtocol, other.mProtocol)

                && Objects.equals(this.mRoamingProtocol, other.mRoamingProtocol)

                && xorEqualsInt(this.mMtuV4, other.mMtuV4)

                && xorEqualsInt(this.mMtuV6, other.mMtuV6)

                && mtuUnsetOrEquals(this.mMtuV4, other.mMtuV4)

                && mtuUnsetOrEquals(this.mMtuV6, other.mMtuV6)

                && Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled)

                && Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask)

                && Objects.equals(this.mLingeringNetworkTypeBitmask,
@@ -1322,7 +1322,12 @@ public class ApnSetting implements Parcelable { 
    // Equal or one is not specified.

    private boolean xorEqualsInt(int first, int second) {

        return first == UNSPECIFIED_INT || second == UNSPECIFIED_INT

            || Objects.equals(first, second);

                || first == second;

    }



    // Equal or one is not specified. Specific to MTU where <= 0 indicates unset.

    private boolean mtuUnsetOrEquals(int first, int second) {

        return first <= 0 || second <= 0 || first == second;

    }



    private String nullToEmpty(String stringValue) {