commit bcd87f596960bf8623545e935b3e892d45cce623
author Alex Deymo <deymo@google.com> Thu Aug 25 16:30:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 25 16:30:43 2016 +0000
tree c8c703d66eaa8f6d1cbdba766b5f8db7ab868b23
parent 84183ba49683678a3420c4c1108be7c1be69443c
parent eb4c32d20d43bb6a36dcbef9b995cd7871c1fa4d

Merge "Silence warning about unused variables in BRILLO."

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index b20fd63..7597054 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -925,9 +925,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;
     }