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

Commit 2830b014 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-merger
Browse files

Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef628 am:... 

Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef628 am: e57ada12 am: d6e32200 am: e2049c7c am: edcd8f90 am: a4996d9f am: 30302ea6 am: f8fc3b7c
am: a7706ab4

* commit 'a7706ab4':
  Camera3Device: Validate template ID
parents a4f84d2c a7706ab4

services/camera/libcameraservice/device3/Camera3Device.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <utils/Trace.h>

#include <utils/Trace.h>

#include <utils/Timers.h>

#include <utils/Timers.h>





#include "CameraService.h"

#include "utils/CameraTraces.h"

#include "utils/CameraTraces.h"

#include "mediautils/SchedulingPolicyService.h"

#include "mediautils/SchedulingPolicyService.h"

#include "device3/Camera3Device.h"

#include "device3/Camera3Device.h"
@@ -1115,6 +1116,13 @@ status_t Camera3Device::createDefaultRequest(int templateId, 
        CameraMetadata *request) {

        CameraMetadata *request) {

    ATRACE_CALL();

    ATRACE_CALL();

    ALOGV("%s: for template %d", __FUNCTION__, templateId);

    ALOGV("%s: for template %d", __FUNCTION__, templateId);



    if (templateId <= 0 || templateId >= CAMERA3_TEMPLATE_COUNT) {

        android_errorWriteWithInfoLog(CameraService::SN_EVENT_LOG_ID, "26866110",

                IPCThreadState::self()->getCallingUid(), NULL, 0);

        return BAD_VALUE;

    }



    Mutex::Autolock il(mInterfaceLock);

    Mutex::Autolock il(mInterfaceLock);

    Mutex::Autolock l(mLock);

    Mutex::Autolock l(mLock);