From feffad62d3ef19b4e128387a991f6492280df6cf Mon Sep 17 00:00:00 2001 From: Ling Ma Date: Fri, 9 Dec 2022 11:30:09 -0800 Subject: [PATCH] Clean up the check of AuthType in simialr() Only check whether authType are the same since it's impossible for authType to be -1(UNSPECIFIED_INT). This change is a cleanup of the check, doesn't change the current behavior. Fix: 261941568 Test: atest Change-Id: I1b19e91d0f3e443a9cc611c88ae289ef3e6d9ce2 Merged-In: I1b19e91d0f3e443a9cc611c88ae289ef3e6d9ce2 --- telephony/java/android/telephony/data/ApnSetting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index b0ddf2c28dff4..0debecfcd11a3 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -1285,7 +1285,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)