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

Commit 2ff41208 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "Fix unmarshalling error and the wrong type check." into main

parents 30704bea 1e58821a

telephony/java/android/telephony/satellite/SatelliteSubscriberInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ public final class SatelliteSubscriberInfo implements Parcelable { 
    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (!(o instanceof SatelliteSubscriberProvisionStatus)) return false;

        if (!(o instanceof SatelliteSubscriberInfo)) return false;

        SatelliteSubscriberInfo that = (SatelliteSubscriberInfo) o;

        return Objects.equals(mSubscriberId, that.mSubscriberId) && mCarrierId == that.mCarrierId

                && Objects.equals(mNiddApn, that.mNiddApn) && mSubId == that.mSubId

telephony/java/android/telephony/satellite/SatelliteSubscriberProvisionStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class SatelliteSubscriberProvisionStatus implements Parcelable { 
    @Override

    @FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)

    public void writeToParcel(@NonNull Parcel out, int flags) {

        mSubscriberInfo.writeToParcel(out, flags);

        out.writeParcelable(mSubscriberInfo, flags);

        out.writeBoolean(mProvisionStatus);

    }