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

Merge "Merge "Fixed the incorrect APN dedupling" into tm-dev am: 809036e638 am: ff496fe76c" into tm-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-04-27 17:27:26 +00:00
committed by Android (Google) Code Review
parent 719e7e6c8c b0d305f4a0
commit b7ee5043da
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.mOperatorNumeric, other.mOperatorNumeric)
&& Objects.equals(this.mProtocol, other.mProtocol) && Objects.equals(this.mProtocol, other.mProtocol)
&& Objects.equals(this.mRoamingProtocol, other.mRoamingProtocol) && Objects.equals(this.mRoamingProtocol, other.mRoamingProtocol)
&& xorEqualsInt(this.mMtuV4, other.mMtuV4) && mtuUnsetOrEquals(this.mMtuV4, other.mMtuV4)
&& xorEqualsInt(this.mMtuV6, other.mMtuV6) && mtuUnsetOrEquals(this.mMtuV6, other.mMtuV6)
&& Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled) && Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled)
&& Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask) && Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask)
&& Objects.equals(this.mLingeringNetworkTypeBitmask, && Objects.equals(this.mLingeringNetworkTypeBitmask,
@@ -1322,7 +1322,12 @@ public class ApnSetting implements Parcelable {
// Equal or one is not specified. // Equal or one is not specified.
private boolean xorEqualsInt(int first, int second) { private boolean xorEqualsInt(int first, int second) {
return first == UNSPECIFIED_INT || second == UNSPECIFIED_INT 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) { private String nullToEmpty(String stringValue) {