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 | b7a67942823e8339eb298238f117aaa6d7b63111 (patch) | |
| tree | cd07930a4e5c17f61ae9b06f96fbfa4debde66cc /services/camera/libcameraservice/CameraService.h | |
| parent | f1cca5ade334859bf23cf8aa5e73bad653681c8c (diff) | |
| download | frameworks_av-b7a67942823e8339eb298238f117aaa6d7b63111.zip frameworks_av-b7a67942823e8339eb298238f117aaa6d7b63111.tar.gz frameworks_av-b7a67942823e8339eb298238f117aaa6d7b63111.tar.bz2 | |
Handle the camera open failure better.
Check if camera hardware is NULL to avoid mediaserver crash.
Change-Id: Ibde0251f30bdb6b36a5d5380222d7be25ec9449c
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 77ccf41..0d69836 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -106,6 +106,7 @@ private: friend class CameraService; Client(const sp<CameraService>& cameraService, const sp<ICameraClient>& cameraClient, + const sp<CameraHardwareInterface>& hardware, int cameraId, int clientPid); ~Client(); |