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." into pi-dev

Browse Source 
am: 63a6bc6794

Change-Id: Ib87a7af0654cc1ec0db052d8ee72f4c74c0aea04
This commit is contained in:
Brad Ebinger
2018-04-14 17:25:44 -07:00
committed by android-build-merger
parent 3ec1692a65 63a6bc6794
commit 5e5e0760de
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();
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