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

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

Merge changes from topic "presubmit-am-877e172c4fa74f85876fa80ed0ef9e2b" into tm-mainline-prod 

* changes:
  [automerge] Camera: Validate physical setting map in OutputConfiguration.writeParcel 2p: 231f7b67
  Camera: Validate physical setting map in OutputConfiguration.writeParcel
parents 87733960 2c583427

core/java/android/hardware/camera2/CaptureRequest.java

+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.