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

Commit 205a224e authored by Alex Deymo's avatar Alex Deymo Committed by android-build-merger
Browse files

Merge "Silence warning about unused variables in BRILLO." am: bcd87f59 

am: ca59abe1

Change-Id: Ic2e37c41dad8579cdcd28e6698fce991854c7962
parents 50859c32 ca59abe1

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -925,9 +925,9 @@ Status CameraService::validateConnectLocked(const String8& cameraId, 
        const String8& clientName8, /*inout*/int& clientUid, /*inout*/int& clientPid,

        /*out*/int& originalClientPid) const {



#if !defined(__BRILLO__)

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

            originalClientPid);

#if !defined(__BRILLO__)

    if (!allowed.isOk()) {

        return allowed;

    }