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

Commit 744c3070 authored by Alex Deymo's avatar Alex Deymo Committed by android-build-merger
Browse files

Merge "Mark unused parameters as UNUSED in BRILLO." am: 1567662f 

am: 002a0ffe

Change-Id: I597292095289b14e1b2e4652e78344aa193bf26e
parents 4dc093f3 002a0ffe

services/camera/libcameraservice/CameraService.cpp

+8 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <android/hardware/ICamera.h>

#include <android/hardware/ICameraClient.h>



#include <android-base/macros.h>

#include <binder/AppOpsManager.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>
@@ -925,13 +926,18 @@ Status CameraService::validateConnectLocked(const String8& cameraId, 
        const String8& clientName8, /*inout*/int& clientUid, /*inout*/int& clientPid,

        /*out*/int& originalClientPid) const {



#ifdef __BRILLO__

    UNUSED(clientName8);

    UNUSED(clientUid);

    UNUSED(clientPid);

    UNUSED(originalClientPid);

#else

    Status allowed = validateClientPermissionsLocked(cameraId, clientName8, clientUid, clientPid,

            originalClientPid);

#if !defined(__BRILLO__)

    if (!allowed.isOk()) {

        return allowed;

    }

#endif  // defined(__BRILLO__)

#endif  // __BRILLO__



    int callingPid = getCallingPid();