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

Commit 2c583427 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Camera: Validate physical setting map in OutputConfiguration.writeParcel 2p: 231f7b67 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17491592

Bug: 220730433
Change-Id: I6a3dd77ace4d36f77fd2c436eeaba681e53f7dfc
parents ba17bf6d 231f7b67

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.