Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support data profile merging" am: 88e08cbb06

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

Change-Id: Ie68243250e7df6fc1a726ff0007e61104ad5f739
This commit is contained in:
Treehugger Robot
2022-03-22 03:49:01 +00:00
committed by Automerger Merge Worker
parent 365d0e5079 88e08cbb06
commit 32898f85ed
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -1274,22 +1274,32 @@ public class ApnSetting implements Parcelable {
return (!this.canHandleType(TYPE_DUN) return (!this.canHandleType(TYPE_DUN)
&& !other.canHandleType(TYPE_DUN) && !other.canHandleType(TYPE_DUN)
&& Objects.equals(this.mApnName, other.mApnName) && Objects.equals(this.mApnName, other.mApnName)
&& !typeSameAny(this, other)
&& xorEqualsString(this.mProxyAddress, other.mProxyAddress) && xorEqualsString(this.mProxyAddress, other.mProxyAddress)
&& xorEqualsInt(this.mProxyPort, other.mProxyPort) && 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) && xorEquals(this.mMmsc, other.mMmsc)
&& xorEqualsString(this.mMmsProxyAddress, other.mMmsProxyAddress) && xorEqualsString(this.mMmsProxyAddress, other.mMmsProxyAddress)
&& xorEqualsInt(this.mMmsProxyPort, other.mMmsProxyPort)) && 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(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask)
&& Objects.equals(mApnSetId, other.mApnSetId) && Objects.equals(this.mLingeringNetworkTypeBitmask,
&& Objects.equals(mCarrierId, other.mCarrierId) other.mLingeringNetworkTypeBitmask)
&& Objects.equals(mSkip464Xlat, other.mSkip464Xlat); && 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. // Equal or one is null.