commit f7c47d81710975cee39127046a6cbd612f932209
author Ling Ma <linggm@google.com> Tue Apr 25 22:40:15 2023 +0000
committer Jack Yu <jackyu@google.com> Tue Apr 25 23:00:50 2023 +0000
tree 4ac7a8394acaf8b59aeff34129e74cb591c0c469
parent 0bfced78d3bac6fcb6c7f1ee9ccad7c4d47991ce

Revert "[Telephony]Fix:Duplicate set up data call request for sa..."

Revert submission 22309362-DUPLICATE_RMNET_ON_PROFILE_CHANGE_FIX

Reason for revert: b/276446877, b/277925484, b/277711525, b/277925691, b/278653254

Reverted changes: /q/submissionid:22309362-DUPLICATE_RMNET_ON_PROFILE_CHANGE_FIX

Change-Id: I39c42ea80e1645da482d780e2d5099ec8a4e53d2

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 1ce85ba..554beb9 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1186,6 +1186,7 @@
         ApnSetting other = (ApnSetting) o;
 
         return mEntryName.equals(other.mEntryName)
+                && Objects.equals(mId, other.mId)
                 && Objects.equals(mOperatorNumeric, other.mOperatorNumeric)
                 && Objects.equals(mApnName, other.mApnName)
                 && Objects.equals(mProxyAddress, other.mProxyAddress)