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

Commit 1a353ab2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support data profile merging" am: 88e08cbb am: 32898f85 

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

Change-Id: I1f4e6828a8b9e12a93b07b9a4efe993a416d1360
parents 0e3c16a1 32898f85

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

+28 −18
Original line number Diff line number Diff line
@@ -1274,22 +1274,32 @@ public class ApnSetting implements Parcelable { 
        return (!this.canHandleType(TYPE_DUN)

                && !other.canHandleType(TYPE_DUN)

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

            && !typeSameAny(this, other)

                && xorEqualsString(this.mProxyAddress, other.mProxyAddress)

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

            && xorEquals(this.mProtocol, other.mProtocol)

            && xorEquals(this.mRoamingProtocol, other.mRoamingProtocol)

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

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

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

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

                && xorEquals(this.mMmsc, other.mMmsc)

                && xorEqualsString(this.mMmsProxyAddress, other.mMmsProxyAddress)

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

                && xorEqualsString(this.mUser, other.mUser)

                && xorEqualsString(this.mPassword, other.mPassword)

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

                && !typeSameAny(this, other)

                && 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)

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

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

            && Objects.equals(mApnSetId, other.mApnSetId)

            && Objects.equals(mCarrierId, other.mCarrierId)

            && Objects.equals(mSkip464Xlat, other.mSkip464Xlat);

                && Objects.equals(this.mLingeringNetworkTypeBitmask,

                other.mLingeringNetworkTypeBitmask)

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

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

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

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

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

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

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

                && Objects.equals(this.mAlwaysOn, other.mAlwaysOn);

    }



    // Equal or one is null.