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

Commit 5c1bf925 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Validate physical setting map in... 

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

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



Change-Id: Iace119e4a402593a5f5670df93bc087b06d9c544
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f7ce6a6 a594d4ca

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.