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

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

Merge "Adds a private field to parceled data." into pi-dev 

am: 63a6bc67

Change-Id: Ib87a7af0654cc1ec0db052d8ee72f4c74c0aea04
parents 3ec1692a 63a6bc67

telephony/java/android/telephony/ims/ImsSsData.java

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ public final class ImsSsData implements Parcelable { 
        result = in.readInt();

        mSsInfo = in.createIntArray();

        mCfInfo = (ImsCallForwardInfo[])in.readParcelableArray(this.getClass().getClassLoader());

        mImsSsInfo = (ImsSsInfo[])in.readParcelableArray(this.getClass().getClassLoader());

    }



    public static final Creator<ImsSsData> CREATOR = new Creator<ImsSsData>() {
@@ -319,6 +320,7 @@ public final class ImsSsData implements Parcelable { 
        out.writeInt(result);

        out.writeIntArray(mSsInfo);

        out.writeParcelableArray(mCfInfo, 0);

        out.writeParcelableArray(mImsSsInfo, 0);

    }



    @Override