Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge similar data profile - ignore gid difference

Browse Source 
Fix: 240225494
Test: atest
Merged-In: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
Change-Id: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
This commit is contained in:
Ling Ma
2022-08-26 15:05:04 -07:00
committed by Jack Yu
parent e073b7ed65
commit dc0f4bd401
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -1109,6 +1109,7 @@ public class ApnSetting implements Parcelable {
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 @@ public class ApnSetting implements Parcelable {
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)