diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-19 21:45:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-19 21:45:46 -0700 |
| commit | 271c1bfd60eaa20c3f37e685864d992e0770ac00 (patch) | |
| tree | 1b6ca1cfce57d3af44fd1dc21a72127aeefb210b /include | |
| parent | 2f6d975b93bbc5b55c35a00d913ee38ad9b76401 (diff) | |
| parent | e7044384b24051c9ac1ceef951beb97bbf8cf0f3 (diff) | |
| download | frameworks_base-271c1bfd60eaa20c3f37e685864d992e0770ac00.zip frameworks_base-271c1bfd60eaa20c3f37e685864d992e0770ac00.tar.gz frameworks_base-271c1bfd60eaa20c3f37e685864d992e0770ac00.tar.bz2 | |
Merge "Handle the camera open failure better." into gingerbread
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraHardwareInterface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/camera/CameraHardwareInterface.h b/include/camera/CameraHardwareInterface.h index 1529db7..6a66e3c 100644 --- a/include/camera/CameraHardwareInterface.h +++ b/include/camera/CameraHardwareInterface.h @@ -221,6 +221,7 @@ public: */ extern "C" int HAL_getNumberOfCameras(); extern "C" void HAL_getCameraInfo(int cameraId, struct CameraInfo* cameraInfo); +/* HAL should return NULL if it fails to open camera hardware. */ extern "C" sp<CameraHardwareInterface> HAL_openCameraHardware(int cameraId); }; // namespace android |