OutputConfiguration: fix CREATOR readList for sensor pixel modes.
OutputConfiguration uses writeIntArray in writeToParcel. It must use
readIntArray in createFromParcel instead of readList.
Bug: 188675581
Test: Sample app which tries to write invalid data into an
OutputConfiguration parcel. When read again, the exception is
thrown and not swallowed.
Test: create OutputConfiguration; add certain sensorPixelModes;
writeToParcel; set parcel's data position to 0; create
OutputConfiguration from same parcel and read sensor pixel modes.
They match.
Change-Id: Id50396d328ba6fc830012a1c359934cf82249764
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
This commit is contained in:
@@ -735,8 +735,7 @@ public final class OutputConfiguration implements Parcelable {
|
|||||||
source.readTypedList(surfaces, Surface.CREATOR);
|
source.readTypedList(surfaces, Surface.CREATOR);
|
||||||
String physicalCameraId = source.readString();
|
String physicalCameraId = source.readString();
|
||||||
boolean isMultiResolutionOutput = source.readInt() == 1;
|
boolean isMultiResolutionOutput = source.readInt() == 1;
|
||||||
ArrayList<Integer> sensorPixelModesUsed = new ArrayList<Integer>();
|
int[] sensorPixelModesUsed = source.createIntArray();
|
||||||
source.readList(sensorPixelModesUsed, Integer.class.getClassLoader());
|
|
||||||
checkArgumentInRange(rotation, ROTATION_0, ROTATION_270, "Rotation constant");
|
checkArgumentInRange(rotation, ROTATION_0, ROTATION_270, "Rotation constant");
|
||||||
|
|
||||||
mSurfaceGroupId = surfaceSetId;
|
mSurfaceGroupId = surfaceSetId;
|
||||||
@@ -760,7 +759,7 @@ public final class OutputConfiguration implements Parcelable {
|
|||||||
}
|
}
|
||||||
mPhysicalCameraId = physicalCameraId;
|
mPhysicalCameraId = physicalCameraId;
|
||||||
mIsMultiResolution = isMultiResolutionOutput;
|
mIsMultiResolution = isMultiResolutionOutput;
|
||||||
mSensorPixelModesUsed = sensorPixelModesUsed;
|
mSensorPixelModesUsed = convertIntArrayToIntegerList(sensorPixelModesUsed);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -848,6 +847,17 @@ public final class OutputConfiguration implements Parcelable {
|
|||||||
return integerArray;
|
return integerArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static ArrayList<Integer> convertIntArrayToIntegerList(int[] intArray) {
|
||||||
|
ArrayList<Integer> integerList = new ArrayList<Integer>();
|
||||||
|
if (intArray == null) {
|
||||||
|
return integerList;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < intArray.length; i++) {
|
||||||
|
integerList.add(intArray[i]);
|
||||||
|
}
|
||||||
|
return integerList;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToParcel(Parcel dest, int flags) {
|
public void writeToParcel(Parcel dest, int flags) {
|
||||||
if (dest == null) {
|
if (dest == null) {
|
||||||
@@ -865,7 +875,6 @@ public final class OutputConfiguration implements Parcelable {
|
|||||||
dest.writeInt(mIsMultiResolution ? 1 : 0);
|
dest.writeInt(mIsMultiResolution ? 1 : 0);
|
||||||
// writeList doesn't seem to work well with Integer list.
|
// writeList doesn't seem to work well with Integer list.
|
||||||
dest.writeIntArray(convertIntegerToIntList(mSensorPixelModesUsed));
|
dest.writeIntArray(convertIntegerToIntList(mSensorPixelModesUsed));
|
||||||
//dest.writeArray(mSensorPixelModesUsed.toArray());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user