diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-17 15:45:37 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-08-19 21:44:06 -0700 |
| commit | e7044384b24051c9ac1ceef951beb97bbf8cf0f3 (patch) | |
| tree | b91aefc34bc41e167480c6f9cb2c1de3743fafd0 /include | |
| parent | eba1274978911ea188eead128645299669d02f60 (diff) | |
| download | frameworks_base-e7044384b24051c9ac1ceef951beb97bbf8cf0f3.zip frameworks_base-e7044384b24051c9ac1ceef951beb97bbf8cf0f3.tar.gz frameworks_base-e7044384b24051c9ac1ceef951beb97bbf8cf0f3.tar.bz2 | |
Handle the camera open failure better.
Check if camera hardware is NULL to avoid mediaserver crash.
Change-Id: Ibde0251f30bdb6b36a5d5380222d7be25ec9449c
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 |