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

Merge "camera2: Fix parcelling of sensor pixel modes." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-02 19:10:53 +00:00
committed by Android (Google) Code Review
parent 2ab80e4562 e1a464e141
commit 1cdc8379a8
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/hardware/camera2/params/OutputConfiguration.java
View File

@@ -846,6 +846,14 @@ public final class OutputConfiguration implements Parcelable {
return 0; return 0;
} }
private static int[] convertIntegerToIntList(List<Integer> integerList) {
int[] integerArray = new int[integerList.size()];
for (int i = 0; i < integerList.size(); i++) {
integerArray[i] = integerList.get(i);
}
return integerArray;
}
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
if (dest == null) { if (dest == null) {
@@ -861,7 +869,9 @@ public final class OutputConfiguration implements Parcelable {
dest.writeTypedList(mSurfaces); dest.writeTypedList(mSurfaces);
dest.writeString(mPhysicalCameraId); dest.writeString(mPhysicalCameraId);
dest.writeInt(mIsMultiResolution ? 1 : 0); dest.writeInt(mIsMultiResolution ? 1 : 0);
dest.writeList(mSensorPixelModesUsed); // writeList doesn't seem to work well with Integer list.
dest.writeIntArray(convertIntegerToIntList(mSensorPixelModesUsed));
//dest.writeArray(mSensorPixelModesUsed.toArray());
} }
/** /**