Merge "Silence warning about unused variables in BRILLO." am: bcd87f5969 am: ca59abe191 (f5e60b1e) · Commits · e / os / android_frameworks_av

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;
		}