commit 9c2a2c26c0d70de97f51063b06a5efc79b327eed
author Alex Deymo <deymo@google.com> Thu Aug 25 11:59:14 2016 -0700
committer Alex Deymo <deymo@google.com> Thu Aug 25 12:46:28 2016 -0700
tree 38a886c658a9682bad071c9f52a274aa80432810
parent bcd87f596960bf8623545e935b3e892d45cce623

Mark unused parameters as UNUSED in BRILLO.

Bug: 31068444
Test: `make dist` in Brillo.

Change-Id: Ib0229ad78894fc703e9c5ad7bda4ab2466641f77

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 7597054..5062a08 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -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 @@
         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();