diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-19 21:48:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 21:48:49 -0700 |
| commit | caaf7fe3a407c764f643585d050c16f5fb56503c (patch) | |
| tree | 9ffa580537a419e0b277787ce7e2793343faa545 /include/camera/CameraHardwareInterface.h | |
| parent | 6bacd9c6fb799f185be580a0596214b0ce998999 (diff) | |
| parent | 271c1bfd60eaa20c3f37e685864d992e0770ac00 (diff) | |
| download | frameworks_base-caaf7fe3a407c764f643585d050c16f5fb56503c.zip frameworks_base-caaf7fe3a407c764f643585d050c16f5fb56503c.tar.gz frameworks_base-caaf7fe3a407c764f643585d050c16f5fb56503c.tar.bz2 | |
am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread
Merge commit '271c1bfd60eaa20c3f37e685864d992e0770ac00' into gingerbread-plus-aosp
* commit '271c1bfd60eaa20c3f37e685864d992e0770ac00':
Handle the camera open failure better.
Diffstat (limited to 'include/camera/CameraHardwareInterface.h')
| -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 |