Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868bff5d authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Validate physical setting map in OutputConfiguration.writeParcel" into tm-dev

parents 8629d70a 231f7b67
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -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.