Merge "Fix NPE in QosBearerSession" into udc-dev am: 3c7dc99373

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

Change-Id: I4aaf0e369c639a1b3f097980d65939c30b2ed1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-15 00:47:36 +00:00
committed by Automerger Merge Worker

View File

@@ -102,12 +102,11 @@ public final class QosBearerSession implements Parcelable{
QosBearerSession other = (QosBearerSession) o;
return this.qosBearerSessionId == other.qosBearerSessionId
&& this.qos.equals(other.qos)
&& Objects.equals(this.qos, other.qos)
&& this.qosBearerFilterList.size() == other.qosBearerFilterList.size()
&& this.qosBearerFilterList.containsAll(other.qosBearerFilterList);
}
public static final @NonNull Parcelable.Creator<QosBearerSession> CREATOR =
new Parcelable.Creator<QosBearerSession>() {
@Override