Merge "Clean up the check of AuthType in simialr()" am: 3911dab442 am: 3346b224dc

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

Change-Id: I91aa67a7d3601d768134d8a5829e746c519fe051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-12-14 03:47:33 +00:00
committed by Automerger Merge Worker

View File

@@ -1284,7 +1284,7 @@ public class ApnSetting implements Parcelable {
&& xorEqualsInt(this.mMmsProxyPort, other.mMmsProxyPort))
&& xorEqualsString(this.mUser, other.mUser)
&& xorEqualsString(this.mPassword, other.mPassword)
&& xorEqualsInt(this.mAuthType, other.mAuthType)
&& Objects.equals(this.mAuthType, other.mAuthType)
&& !typeSameAny(this, other)
&& Objects.equals(this.mOperatorNumeric, other.mOperatorNumeric)
&& Objects.equals(this.mProtocol, other.mProtocol)