diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-23 12:02:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-23 12:02:21 -0700 |
| commit | 6c32677db33565fc2798b96b03dd19be2f81084c (patch) | |
| tree | d42adfc0445d8c6d2824d00231ae65737c7e6922 /include | |
| parent | a931e9a15840f9074f1803b5adb2f23b40a1ab1b (diff) | |
| parent | caaf7fe3a407c764f643585d050c16f5fb56503c (diff) | |
| download | frameworks_base-6c32677db33565fc2798b96b03dd19be2f81084c.zip frameworks_base-6c32677db33565fc2798b96b03dd19be2f81084c.tar.gz frameworks_base-6c32677db33565fc2798b96b03dd19be2f81084c.tar.bz2 | |
am caaf7fe3: am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread
Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c'
* commit 'caaf7fe3a407c764f643585d050c16f5fb56503c':
Handle the camera open failure better.
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 |