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

Merge "Merge similar data profile - ignore gid difference" am: d403dae9b8 am: 7c9054f785

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378848

Change-Id: I53cf9c3882bc0c940b6081075213aaab97d5eb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2023-01-06 21:31:20 +00:00
committed by Automerger Merge Worker
parent ec6bc422b7 7c9054f785
commit ec6766ef7b
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(mCarrierId);
sb.append(", ").append(mSkip464Xlat); sb.append(", ").append(mSkip464Xlat);
sb.append(", ").append(mAlwaysOn); sb.append(", ").append(mAlwaysOn);
sb.append(", ").append(Objects.hash(mUser, mPassword));
return sb.toString(); return sb.toString();
} }
@@ -1297,8 +1298,6 @@ public class ApnSetting implements Parcelable {
other.mLingeringNetworkTypeBitmask) other.mLingeringNetworkTypeBitmask)
&& Objects.equals(this.mProfileId, other.mProfileId) && Objects.equals(this.mProfileId, other.mProfileId)
&& Objects.equals(this.mPersistent, other.mPersistent) && 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.mApnSetId, other.mApnSetId)
&& Objects.equals(this.mCarrierId, other.mCarrierId) && Objects.equals(this.mCarrierId, other.mCarrierId)
&& Objects.equals(this.mSkip464Xlat, other.mSkip464Xlat) && Objects.equals(this.mSkip464Xlat, other.mSkip464Xlat)