Caught RuntimeException for Camera.startPreview() and put up an error message. We were getting 135 reports a week about this.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com/google/zxing/client/android/CaptureActivity.java b/src/com/google/zxing/client/android/CaptureActivity.java
index 4cbaf7c7..fbc7891c 100755
--- a/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/src/com/google/zxing/client/android/CaptureActivity.java
@@ -604,19 +604,18 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   private void initCamera(SurfaceHolder surfaceHolder) {
     try {
       CameraManager.get().openDriver(surfaceHolder);
+      // Creating the handler starts the preview, which can also throw a RuntimeException.
+      if (handler == null) {
+        handler = new CaptureActivityHandler(this, decodeFormats, characterSet);
+      }
     } catch (IOException ioe) {
       Log.w(TAG, ioe);
       displayFrameworkBugMessageAndExit();
-      return;
     } catch (RuntimeException e) {
       // Barcode Scanner has seen crashes in the wild of this variety:
       // java.?lang.?RuntimeException: Fail to connect to camera service
       Log.w(TAG, "Unexpected error initializating camera", e);
       displayFrameworkBugMessageAndExit();
-      return;
-    }
-    if (handler == null) {
-      handler = new CaptureActivityHandler(this, decodeFormats, characterSet);
     }
   }