Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3d665cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1afaf87d2365423cd744fe8d444de471c0e22f52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e91ae18 3c7dc993

telephony/java/android/telephony/data/QosBearerSession.java

+1 −2
Original line number Diff line number Diff line
@@ -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