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

Commit 1567662f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Mark unused parameters as UNUSED in BRILLO."

parents b990030f 9c2a2c26

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();