diff options
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 702be0a..1cdb467 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -227,9 +227,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private final AutoFocusCallback mAutoFocusCallback = new AutoFocusCallback(); private final ZoomListener mZoomListener = new ZoomListener(); - // Use the ErrorCallback to capture the crash count - // on the mediaserver - private final ErrorCallback mErrorCallback = new ErrorCallback(); + private final CameraErrorCallback mErrorCallback = new CameraErrorCallback(); private long mFocusStartTime; private long mFocusCallbackTime; @@ -247,9 +245,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, public long mPictureDisplayedToJpegCallbackTime; public long mJpegCallbackFinishTime; - // Add for test - public static boolean mMediaServerDied = false; - // Focus mode. Options are pref_camera_focusmode_entryvalues. private String mFocusMode; private String mSceneMode; @@ -860,16 +855,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, } } - private static final class ErrorCallback - implements android.hardware.Camera.ErrorCallback { - public void onError(int error, android.hardware.Camera camera) { - if (error == android.hardware.Camera.CAMERA_ERROR_SERVER_DIED) { - mMediaServerDied = true; - Log.v(TAG, "media server died"); - } - } - } - private final class ZoomListener implements android.hardware.Camera.OnZoomChangeListener { public void onZoomChange( @@ -1875,6 +1860,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, if (mPausing || isFinishing()) return; ensureCameraDevice(); + mCameraDevice.setErrorCallback(mErrorCallback); // If we're previewing already, stop the preview first (this will blank // the screen). @@ -1884,7 +1870,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, Util.setCameraDisplayOrientation(this, mCameraId, mCameraDevice); setCameraParameters(UPDATE_PARAM_ALL); - mCameraDevice.setErrorCallback(mErrorCallback); try { Log.v(TAG, "startPreview"); |