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

Merge "Fixed the incorrect APN dedupling" into tm-dev am: 809036e638 am: 3c50aad3bd

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

Change-Id: I13fbc605d71474a6ec0b4e22be0812e205a31d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Amruth Ramachandran
2022-04-27 17:27:23 +00:00
committed by Automerger Merge Worker
parent 09644a6eba 3c50aad3bd
commit 6825dd9189
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1293,8 +1293,8 @@ public class ApnSetting implements Parcelable {
&& Objects.equals(this.mOperatorNumeric, other.mOperatorNumeric)
&& Objects.equals(this.mProtocol, other.mProtocol)
&& Objects.equals(this.mRoamingProtocol, other.mRoamingProtocol)
&& xorEqualsInt(this.mMtuV4, other.mMtuV4)
&& xorEqualsInt(this.mMtuV6, other.mMtuV6)
&& mtuUnsetOrEquals(this.mMtuV4, other.mMtuV4)
&& mtuUnsetOrEquals(this.mMtuV6, other.mMtuV6)
&& Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled)
&& Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask)
&& Objects.equals(this.mLingeringNetworkTypeBitmask,
@@ -1322,7 +1322,12 @@ public class ApnSetting implements Parcelable {
// Equal or one is not specified.
private boolean xorEqualsInt(int first, int second) {
return first == UNSPECIFIED_INT || second == UNSPECIFIED_INT
|| Objects.equals(first, second);
|| first == second;
}
// Equal or one is not specified. Specific to MTU where <= 0 indicates unset.
private boolean mtuUnsetOrEquals(int first, int second) {
return first <= 0 || second <= 0 || first == second;
}
private String nullToEmpty(String stringValue) {