Merge "Clean up the check of AuthType in simialr()" am: 3911dab442
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2338919 Change-Id: I7130033759fc162df2303aed60aae6542859af1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1284,7 +1284,7 @@ public class ApnSetting implements Parcelable {
|
|||||||
&& xorEqualsInt(this.mMmsProxyPort, other.mMmsProxyPort))
|
&& xorEqualsInt(this.mMmsProxyPort, other.mMmsProxyPort))
|
||||||
&& xorEqualsString(this.mUser, other.mUser)
|
&& xorEqualsString(this.mUser, other.mUser)
|
||||||
&& xorEqualsString(this.mPassword, other.mPassword)
|
&& xorEqualsString(this.mPassword, other.mPassword)
|
||||||
&& xorEqualsInt(this.mAuthType, other.mAuthType)
|
&& Objects.equals(this.mAuthType, other.mAuthType)
|
||||||
&& !typeSameAny(this, other)
|
&& !typeSameAny(this, other)
|
||||||
&& Objects.equals(this.mOperatorNumeric, other.mOperatorNumeric)
|
&& Objects.equals(this.mOperatorNumeric, other.mOperatorNumeric)
|
||||||
&& Objects.equals(this.mProtocol, other.mProtocol)
|
&& Objects.equals(this.mProtocol, other.mProtocol)
|
||||||
|
|||||||
Reference in New Issue
Block a user