Merge "No need to catch RuntimeException of setAutoFocusMoveCallback." into jb-dev

1 files changed, 4 insertions, 9 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index ce6212c5..7ef64da2 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -2104,15 +2104,10 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         }
 
         if (mContinousFocusSupported) {
-            try {
-                if (mParameters.getFocusMode().equals(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
-                    mCameraDevice.setAutoFocusMoveCallback(mAutoFocusMoveCallback);
-                } else {
-                    mCameraDevice.setAutoFocusMoveCallback(null);
-                }
-            } catch (RuntimeException e) {
-                // Ignore. This can be removed if CTS requires autofocus move
-                // callback.
+            if (mParameters.getFocusMode().equals(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
+                mCameraDevice.setAutoFocusMoveCallback(mAutoFocusMoveCallback);
+            } else {
+                mCameraDevice.setAutoFocusMoveCallback(null);
             }
         }
     }