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

Commit 4cf90ed7 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Camera: Relax input format requirements for RAW reprocessing." into... 

Merge "Camera: Relax input format requirements for RAW reprocessing." into udc-d1-dev am: 9c456880 am: 03b60936

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



Change-Id: I693072017481535b46c5c6ead1126fec69ded041
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0161815f 03b60936

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna 


import android.annotation.NonNull;

import android.content.Context;

import android.graphics.ImageFormat;

import android.hardware.ICameraService;

import android.hardware.camera2.CameraAccessException;

import android.hardware.camera2.CameraCaptureSession;
@@ -1478,6 +1479,12 @@ public class CameraDeviceImpl extends CameraDevice 
            }

        }



        // Allow RAW formats, even when not advertised.

        if (inputFormat == ImageFormat.RAW_PRIVATE || inputFormat == ImageFormat.RAW10

                || inputFormat == ImageFormat.RAW12 || inputFormat == ImageFormat.RAW_SENSOR) {

            return true;

        }



        if (validFormat == false) {

            return false;

        }