diff options
| author | Igor Murashkin <iam@google.com> | 2013-03-20 15:56:31 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-03-26 17:16:11 -0700 |
| commit | cba2c163555cd329f49d40658ea3ee902e94dda3 (patch) | |
| tree | 1d125f0012a52db51a1aec733792c1b41959734c /include/camera | |
| parent | a97d15e2e2f0b317a345d3a6f02df80b8988b1f6 (diff) | |
| download | frameworks_av-cba2c163555cd329f49d40658ea3ee902e94dda3.zip frameworks_av-cba2c163555cd329f49d40658ea3ee902e94dda3.tar.gz frameworks_av-cba2c163555cd329f49d40658ea3ee902e94dda3.tar.bz2 | |
Camera: Add hotplug support (for fixed # of cameras)
* Minor: also change addListener to fire the current status upon subscription
* Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated
Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
Diffstat (limited to 'include/camera')
| -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, |