summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/AndroidCameraManagerImpl.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index 00fe905a9..65dc13728 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -329,6 +329,9 @@ class AndroidCameraManagerImpl implements CameraManager {
Log.e(TAG, "Fail to release the camera.");
}
mCamera = null;
+ } else if (mCamera == null) {
+ Log.w(TAG, "Cannot handle message, mCamera is null.");
+ return;
}
throw e;
}
@@ -347,7 +350,7 @@ class AndroidCameraManagerImpl implements CameraManager {
}
/**
- * A class which implements {@link CameraManager.CameraProxy} and
+ * A class which implements {@link CameraManager.CameraProxy} and
* camera handler thread.
*/
public class AndroidCameraProxyImpl implements CameraManager.CameraProxy {