commit 3911dab4421984b75e89895ba34c6dc7f1079ba3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 14 03:10:56 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 03:10:56 2022 +0000
tree c7a6a8e644fd9319ec43b376aa6561066bae3594
parent 62b3b39e9dbdb4a191876d826237f7600dad0c1e
parent feffad62d3ef19b4e128387a991f6492280df6cf

Merge "Clean up the check of AuthType in simialr()"

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

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index f794a79..3379ce5 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1284,7 +1284,7 @@
                 && 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)