From 6eabb9b770a7c60cb92aa2e22f360754f32f39f8 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Thu, 11 Nov 2010 14:18:35 +0800 Subject: Close the camera application immediately when media server dies. Crash the app earlier. Otherwise, the app will crash later in other places and the log is gone. Getting a new Camera object is not good because it's hard for the app to reset the current state. For example, the state can be autofocus, preview, snapshot, recording, saving thumbnail. bug:3178948 Change-Id: Ibb38e6bfe927ed2ab9b87e2ee47044be8b96727b --- src/com/android/camera/Camera.java | 19 ++------------ src/com/android/camera/CameraErrorCallback.java | 34 +++++++++++++++++++++++++ src/com/android/camera/VideoCamera.java | 6 +++-- 3 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/com/android/camera/CameraErrorCallback.java (limited to 'src') 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"); diff --git a/src/com/android/camera/CameraErrorCallback.java b/src/com/android/camera/CameraErrorCallback.java new file mode 100644 index 0000000..7045506 --- /dev/null +++ b/src/com/android/camera/CameraErrorCallback.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.camera; + +import android.util.Log; + +public class CameraErrorCallback + implements android.hardware.Camera.ErrorCallback { + private static final String TAG = "CameraErrorCallback"; + + public void onError(int error, android.hardware.Camera camera) { + Log.e(TAG, "Got camera error callback. error=" + error); + if (error == android.hardware.Camera.CAMERA_ERROR_SERVER_DIED) { + // We are not sure about the current state of the app (in preview or + // snapshot or recording). Closing the app is better than creating a + // new Camera object. + throw new RuntimeException("Media server died."); + } + } +} diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 2e9b22f..b7e1ff9 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -134,6 +134,9 @@ public class VideoCamera extends NoSearchActivity private final static String EXTRA_QUICK_CAPTURE = "android.intent.extra.quickCapture"; + private android.hardware.Camera mCameraDevice; + private final CameraErrorCallback mErrorCallback = new CameraErrorCallback(); + private ComboPreferences mPreferences; private PreviewFrameLayout mPreviewFrameLayout; @@ -730,6 +733,7 @@ public class VideoCamera extends NoSearchActivity // released and we need to open the camera. mCameraDevice = CameraHolder.instance().open(mCameraId); } + mCameraDevice.setErrorCallback(mErrorCallback); mCameraDevice.lock(); if (mPreviewing == true) { @@ -995,8 +999,6 @@ public class VideoCamera extends NoSearchActivity } } - private android.hardware.Camera mCameraDevice; - // Prepares media recorder. private void initializeRecorder() { Log.v(TAG, "initializeRecorder"); -- cgit v1.1