commit dc0f4bd4017ab0939a90ff8f1600ed75b2116c3e
author Ling Ma <linggm@google.com> Fri Aug 26 15:05:04 2022 -0700
committer Jack Yu <jackyu@google.com> Fri Jan 06 08:22:08 2023 -0800
tree d21eee4f7b800f90aa771b861d42d6a348abad08
parent e073b7ed659145f64acc1697312a5f2ac803077d

Merge similar data profile - ignore gid difference

Fix: 240225494
Test: atest
Merged-In: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
Change-Id: Id203a3ba71adb3783edcf2c1e1f885c129e9328a

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 3379ce5..b32f046 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1109,6 +1109,7 @@
         sb.append(", ").append(mCarrierId);
         sb.append(", ").append(mSkip464Xlat);
         sb.append(", ").append(mAlwaysOn);
+        sb.append(", ").append(Objects.hash(mUser, mPassword));
         return sb.toString();
     }
 
@@ -1297,8 +1298,6 @@
                 other.mLingeringNetworkTypeBitmask)
                 && Objects.equals(this.mProfileId, other.mProfileId)
                 && Objects.equals(this.mPersistent, other.mPersistent)
-                && Objects.equals(this.mMvnoType, other.mMvnoType)
-                && Objects.equals(this.mMvnoMatchData, other.mMvnoMatchData)
                 && Objects.equals(this.mApnSetId, other.mApnSetId)
                 && Objects.equals(this.mCarrierId, other.mCarrierId)
                 && Objects.equals(this.mSkip464Xlat, other.mSkip464Xlat)