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

Commit 1e58821a authored by Hyosun's avatar Hyosun Committed by Hyosun Kim
Browse files

Fix unmarshalling error and the wrong type check. 

Bug: 360214847
Test: manual test with test apk
Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn

Change-Id: I928e22dc7fcc5602ed44c4df24c7896c2fceed5c
parent 0ab15474

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);

    }