Don't crash when camera restrctions are engaged.

Also has cleanups a some old code that's been disabled for a while.

git-svn-id: https://zxing.googlecode.com/svn/trunk@2868 59b500cc-1b3d-0410-9834-0bbf25fbcc57