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

Merge "Override equals and hashCode methods for EpsBearerQosSessionAttributes and NrQosSessionAttributes" into sc-dev am: 65b0d73c81

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

Change-Id: Ic7c8411852316a1b33d1507f03dc01ae0f9fd10c
This commit is contained in:
Jayachandran Chinnakkannu
2021-06-03 19:37:48 +00:00
committed by Automerger Merge Worker
parent e711f2d390 65b0d73c81
commit 1e60066548
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
telephony/java/android/telephony/data/EpsBearerQosSessionAttributes.java
View File

@@ -206,6 +206,26 @@ public final class EpsBearerQosSessionAttributes implements Parcelable, QosSessi
} }
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
EpsBearerQosSessionAttributes epsBearerAttr = (EpsBearerQosSessionAttributes) o;
return mQci == epsBearerAttr.mQci
&& mMaxUplinkBitRate == epsBearerAttr.mMaxUplinkBitRate
&& mMaxDownlinkBitRate == epsBearerAttr.mMaxDownlinkBitRate
&& mGuaranteedUplinkBitRate == epsBearerAttr.mGuaranteedUplinkBitRate
&& mGuaranteedDownlinkBitRate == epsBearerAttr.mGuaranteedDownlinkBitRate
&& mRemoteAddresses.size() == epsBearerAttr.mRemoteAddresses.size()
&& mRemoteAddresses.containsAll(epsBearerAttr.mRemoteAddresses);
}
@Override
public int hashCode() {
return Objects.hash(mQci, mMaxUplinkBitRate, mMaxDownlinkBitRate,
mGuaranteedUplinkBitRate, mGuaranteedDownlinkBitRate, mRemoteAddresses);
}
@NonNull @NonNull
public static final Creator<EpsBearerQosSessionAttributes> CREATOR = public static final Creator<EpsBearerQosSessionAttributes> CREATOR =
new Creator<EpsBearerQosSessionAttributes>() { new Creator<EpsBearerQosSessionAttributes>() {

24
telephony/java/android/telephony/data/NrQosSessionAttributes.java
View File

@@ -241,6 +241,30 @@ public final class NrQosSessionAttributes implements Parcelable, QosSessionAttri
} }
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
NrQosSessionAttributes nrQosAttr = (NrQosSessionAttributes) o;
return m5Qi == nrQosAttr.m5Qi
&& mQfi == nrQosAttr.mQfi
&& mMaxUplinkBitRate == nrQosAttr.mMaxUplinkBitRate
&& mMaxDownlinkBitRate == nrQosAttr.mMaxDownlinkBitRate
&& mGuaranteedUplinkBitRate == nrQosAttr.mGuaranteedUplinkBitRate
&& mGuaranteedDownlinkBitRate == nrQosAttr.mGuaranteedDownlinkBitRate
&& mAveragingWindow == nrQosAttr.mAveragingWindow
&& mRemoteAddresses.size() == nrQosAttr.mRemoteAddresses.size()
&& mRemoteAddresses.containsAll(nrQosAttr.mRemoteAddresses);
}
@Override
public int hashCode() {
return Objects.hash(m5Qi, mQfi, mMaxUplinkBitRate,
mMaxDownlinkBitRate, mGuaranteedUplinkBitRate,
mGuaranteedDownlinkBitRate, mAveragingWindow, mRemoteAddresses);
}
@NonNull @NonNull
public static final Creator<NrQosSessionAttributes> CREATOR = public static final Creator<NrQosSessionAttributes> CREATOR =
new Creator<NrQosSessionAttributes>() { new Creator<NrQosSessionAttributes>() {