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

Commit 16d2cb85 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:... 

Merge "Silence warning about unused variables in BRILLO." am: bcd87f59 am: ca59abe1 am: 205a224e
am: f5e60b1e

Change-Id: I59597bd9c700439ca67f8a6ab9b055492a5dda29
parents 5fd8de70 f5e60b1e

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -926,9 +926,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;

    }