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

Commit d43beff3 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Fix parcelling issue for certain fields." into qt-dev am: 1f0eec4f 

am: 96f3bfa2

Change-Id: I554cb5b810e8c23eaddc0b76712da094adc09e7e
parents 6016aead 96f3bfa2

telephony/java/android/telephony/ims/ImsSsInfo.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -250,6 +250,8 @@ public final class ImsSsInfo implements Parcelable { 
        out.writeInt(mStatus);

        out.writeInt(mStatus);

        out.writeString(mIcbNum);

        out.writeString(mIcbNum);

        out.writeInt(mProvisionStatus);

        out.writeInt(mProvisionStatus);

        out.writeInt(mClirInterrogationStatus);

        out.writeInt(mClirOutgoingState);

    }

    }





    @Override

    @Override
@@ -273,6 +275,8 @@ public final class ImsSsInfo implements Parcelable { 
        mStatus = in.readInt();

        mStatus = in.readInt();

        mIcbNum = in.readString();

        mIcbNum = in.readString();

        mProvisionStatus = in.readInt();

        mProvisionStatus = in.readInt();

        mClirInterrogationStatus = in.readInt();

        mClirOutgoingState = in.readInt();

    }

    }





    public static final @android.annotation.NonNull Creator<ImsSsInfo> CREATOR =

    public static final @android.annotation.NonNull Creator<ImsSsInfo> CREATOR =