summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/Camera.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/hardware/Camera.java')
-rw-r--r--core/java/android/hardware/Camera.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 49f6513..d88594d 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1803,8 +1803,6 @@ public class Camera {
public Point mouth = null;
}
- // Error codes match the enum in include/ui/Camera.h
-
/**
* Unspecified camera error.
* @see Camera.ErrorCallback
@@ -1812,6 +1810,12 @@ public class Camera {
public static final int CAMERA_ERROR_UNKNOWN = 1;
/**
+ * Camera was disconnected due to use by higher priority user.
+ * @see Camera.ErrorCallback
+ */
+ public static final int CAMERA_ERROR_EVICTED = 2;
+
+ /**
* Media server died. In this case, the application must release the
* Camera object and instantiate a new one.
* @see Camera.ErrorCallback