summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-03-22 00:45:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-22 00:45:55 +0000
commita97d15e2e2f0b317a345d3a6f02df80b8988b1f6 (patch)
tree634b3a96946665bf2bb7b5cde88c9d6ca8a17704 /include/camera
parent3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1 (diff)
parentb652df67cbdc2a92825144b23ea47eba4c276edd (diff)
downloadframeworks_av-a97d15e2e2f0b317a345d3a6f02df80b8988b1f6.zip
frameworks_av-a97d15e2e2f0b317a345d3a6f02df80b8988b1f6.tar.gz
frameworks_av-a97d15e2e2f0b317a345d3a6f02df80b8988b1f6.tar.bz2
Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/ICameraServiceListener.h23
1 files changed, 21 insertions, 2 deletions
diff --git a/include/camera/ICameraServiceListener.h b/include/camera/ICameraServiceListener.h
index 207116a..88860dd 100644
--- a/include/camera/ICameraServiceListener.h
+++ b/include/camera/ICameraServiceListener.h
@@ -28,11 +28,30 @@ class ICameraServiceListener : public IInterface
{
public:
+ /**
+ * Initial status will be transmitted with onStatusChange immediately
+ * after this listener is added to the service listener list.
+ *
+ * Allowed transitions:
+ *
+ * (Any) -> NOT_PRESENT
+ * NOT_PRESENT -> PRESENT
+ * NOT_PRESENT -> ENUMERATING
+ * ENUMERATING -> PRESENT
+ * PRESENT -> AVAILABLE
+ * AVAILABLE -> NOT_AVAILABLE
+ * NOT_AVAILABLE -> AVAILABLE
+ *
+ * A state will never immediately transition back to itself.
+ */
enum Status {
// Device physically unplugged
- STATUS_PRESENT = CAMERA_DEVICE_STATUS_PRESENT,
- // Device physically re-plugged
STATUS_NOT_PRESENT = CAMERA_DEVICE_STATUS_NOT_PRESENT,
+ // Device physically has been plugged in
+ STATUS_PRESENT = CAMERA_DEVICE_STATUS_PRESENT,
+ // Device physically has been plugged in
+ // but it will not be connect-able until enumeration is complete
+ STATUS_ENUMERATING = CAMERA_DEVICE_STATUS_ENUMERATING,
// Camera can be used exclusively
STATUS_AVAILABLE = 0x80000000,