From 99011addb37ea79802fa668b1c7ca979a4f985ce Mon Sep 17 00:00:00 2001 From: srowen Date: Wed, 4 Jul 2012 20:28:06 +0000 Subject: [PATCH] Swallow weird RuntimeException on cancelling auto focus git-svn-id: https://zxing.googlecode.com/svn/trunk@2340 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../zxing/client/android/camera/AutoFocusManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java index bd7a32cb6..4e7e543d3 100644 --- a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java +++ b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java @@ -87,7 +87,12 @@ final class AutoFocusManager implements Camera.AutoFocusCallback { synchronized void stop() { if (useAutoFocus) { - camera.cancelAutoFocus(); + try { + camera.cancelAutoFocus(); + } catch (RuntimeException re) { + // Have heard RuntimeException reported in Android 4.0.x+; continue? + Log.w(TAG, "Unexpected exception while cancelling focusing", re); + } } if (outstandingTask != null) { outstandingTask.cancel();