diff options
| author | Igor Murashkin <iam@google.com> | 2013-03-22 00:45:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-22 00:45:55 +0000 |
| commit | 2247dd0dc60096d1b5a91ccadb5539f0b100c88f (patch) | |
| tree | 88a6d3b2e506d786f3d0e2310dc777f03e8d6a2f /include | |
| parent | f760a1b26a907f4f5b133dde66880bb666540c42 (diff) | |
| parent | b1a142ce32feb4668c504c0860a7350d000fe7fa (diff) | |
| download | frameworks_av-2247dd0dc60096d1b5a91ccadb5539f0b100c88f.zip frameworks_av-2247dd0dc60096d1b5a91ccadb5539f0b100c88f.tar.gz frameworks_av-2247dd0dc60096d1b5a91ccadb5539f0b100c88f.tar.bz2 | |
Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/ICameraServiceListener.h | 23 |
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, |