From 3ac88488ae9225ecee7eeb2269dc5130105c2d6a Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Mon, 13 Mar 2023 19:22:38 -0700 Subject: [PATCH] Fix NPE in QosBearerSession Test: atest QosBearerSessionTest Bug: 271893427 Change-Id: I24a85cdbdda964be86b8b9d2880c1c9bfd516c31 --- telephony/java/android/telephony/data/QosBearerSession.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/data/QosBearerSession.java b/telephony/java/android/telephony/data/QosBearerSession.java index dd080856d450b..1668193e076cf 100644 --- a/telephony/java/android/telephony/data/QosBearerSession.java +++ b/telephony/java/android/telephony/data/QosBearerSession.java @@ -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 CREATOR = new Parcelable.Creator() { @Override