Camera: Validate physical setting map in OutputConfiguration.writeParcel

If the physical camera settings map doesn't contain a key for the
logical camera id, throws an exception.

Test: LogicalCameraDeviceTest
Bug: 220730433
Change-Id: I716fa4b81a6e48538aebfac41b96d5d21fdb6a2e
This commit is contained in:
Shuzhen Wang
2022-03-25 13:59:06 -07:00
parent 6782f93142
commit 231f7b67ff

View File

@@ -623,6 +623,11 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
@Override
public void writeToParcel(Parcel dest, int flags) {
if (!mPhysicalCameraSettings.containsKey(mLogicalCameraId)) {
throw new IllegalStateException("Physical camera settings map must contain a key for "
+ "the logical camera id.");
}
int physicalCameraCount = mPhysicalCameraSettings.size();
dest.writeInt(physicalCameraCount);
//Logical camera id and settings always come first.