From 44f120fa169cb3131ec853c638ea9c88a9b33b97 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Tue, 9 Oct 2012 14:45:37 -0700 Subject: Camera: Clear Hardware device pointer when initialization fails When disconnecting, don't try to call device functions if the initialization fails since this can lead to internal HAL segfaults. Bug: 7317107 Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff --- services/camera/libcameraservice/CameraClient.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'services') diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 5b59ef9..7e199fa 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -73,6 +73,7 @@ status_t CameraClient::initialize(camera_module_t *module) { if (res != OK) { ALOGE("%s: Camera %d: unable to initialize device: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); + mHardware.clear(); return NO_INIT; } -- cgit v1.1