commit f5e60b1e798d15fc466f5f15a4db6920e4d0c2d1
author Alex Deymo <deymo@google.com> Thu Aug 25 16:47:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 25 16:47:21 2016 +0000
tree 1cc8967443372ea839d69eb19b1e2762cd237414
parent 78e800e9369636a2a17d668a90eeaab275e83d5e
parent 205a224eeee3cb41395af783755c347bb6ce7a02

Merge "Silence warning about unused variables in BRILLO." am: bcd87f5969 am: ca59abe191
am: 205a224eee

Change-Id: Id4e0626842a3d9f170e29a364f4d31020172f233

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 14e92ad..c58a2e3 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -926,9 +926,9 @@
         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;
     }