Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adds a private field to parceled data."

Browse Source 
am: 7db23752ab

Change-Id: I9d0bde31a8aeb67b62e202b3b8946b066b81d186
This commit is contained in:
Brad Ebinger
2018-06-08 12:27:22 -07:00
committed by android-build-merger
parent a56e388a75 7db23752ab
commit 1ff8f364d4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/ims/ImsSsData.java
View File

@@ -296,6 +296,7 @@ public final class ImsSsData implements Parcelable {
result = in.readInt(); result = in.readInt();
mSsInfo = in.createIntArray(); mSsInfo = in.createIntArray();
mCfInfo = (ImsCallForwardInfo[])in.readParcelableArray(this.getClass().getClassLoader()); mCfInfo = (ImsCallForwardInfo[])in.readParcelableArray(this.getClass().getClassLoader());
mImsSsInfo = (ImsSsInfo[])in.readParcelableArray(this.getClass().getClassLoader());
} }
public static final Creator<ImsSsData> CREATOR = new Creator<ImsSsData>() { public static final Creator<ImsSsData> CREATOR = new Creator<ImsSsData>() {
@@ -319,6 +320,7 @@ public final class ImsSsData implements Parcelable {
out.writeInt(result); out.writeInt(result);
out.writeIntArray(mSsInfo); out.writeIntArray(mSsInfo);
out.writeParcelableArray(mCfInfo, 0); out.writeParcelableArray(mCfInfo, 0);
out.writeParcelableArray(mImsSsInfo, 0);
} }
@Override @Override