diff options
| author | Igor Murashkin <iam@google.com> | 2013-03-27 22:43:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-27 22:43:14 +0000 |
| commit | 8d012b56cbd49f33841c13aaa5b7b42020de82ed (patch) | |
| tree | 240cbe1534e19bd52b6f55e5d9623de2a7fea010 /include | |
| parent | ac51135d48ded504af38f0bc7fda47823419332f (diff) | |
| parent | a36381479c5c546a01188390f1e0d2e280a3dbd8 (diff) | |
| download | frameworks_av-8d012b56cbd49f33841c13aaa5b7b42020de82ed.zip frameworks_av-8d012b56cbd49f33841c13aaa5b7b42020de82ed.tar.gz frameworks_av-8d012b56cbd49f33841c13aaa5b7b42020de82ed.tar.bz2 | |
Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/ICameraServiceListener.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/camera/ICameraServiceListener.h b/include/camera/ICameraServiceListener.h index 88860dd..f2a11c2 100644 --- a/include/camera/ICameraServiceListener.h +++ b/include/camera/ICameraServiceListener.h @@ -38,9 +38,8 @@ public: * NOT_PRESENT -> PRESENT * NOT_PRESENT -> ENUMERATING * ENUMERATING -> PRESENT - * PRESENT -> AVAILABLE - * AVAILABLE -> NOT_AVAILABLE - * NOT_AVAILABLE -> AVAILABLE + * PRESENT -> NOT_AVAILABLE + * NOT_AVAILABLE -> PRESENT * * A state will never immediately transition back to itself. */ @@ -48,15 +47,17 @@ public: // Device physically unplugged STATUS_NOT_PRESENT = CAMERA_DEVICE_STATUS_NOT_PRESENT, // Device physically has been plugged in + // and the camera can be used exlusively 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, + STATUS_AVAILABLE = STATUS_PRESENT, // deprecated, will be removed + // Camera is in use by another app and cannot be used exclusively - STATUS_NOT_AVAILABLE, + STATUS_NOT_AVAILABLE = 0x80000000, // Use to initialize variables only STATUS_UNKNOWN = 0xFFFFFFFF, |