LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Tempates with different subscriber ID should be not equal"

Browse Source
This commit is contained in:
Aaron Huang
2023-02-10 08:06:07 +00:00
committed by Gerrit Code Review
parent 9f3857754d c9371d05fe
commit 2a69e41772
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework-t/src/android/net/NetworkTemplate.java
View File

@@ -383,8 +383,9 @@ public final class NetworkTemplate implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(mMatchRule, Arrays.hashCode(mMatchWifiNetworkKeys),
mMetered, mRoaming, mDefaultNetwork, mRatType, mOemManaged);
return Objects.hash(mMatchRule, Arrays.hashCode(mMatchSubscriberIds),
Arrays.hashCode(mMatchWifiNetworkKeys), mMetered, mRoaming, mDefaultNetwork,
mRatType, mOemManaged);
}
@Override
@@ -397,6 +398,7 @@ public final class NetworkTemplate implements Parcelable {
&& mDefaultNetwork == other.mDefaultNetwork
&& mRatType == other.mRatType
&& mOemManaged == other.mOemManaged
&& Arrays.equals(mMatchSubscriberIds, other.mMatchSubscriberIds)
&& Arrays.equals(mMatchWifiNetworkKeys, other.mMatchWifiNetworkKeys);
}
return false;