summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.cpp
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-12 18:45:36 -0800
committerSteve Kondik <steve@cyngn.com>2016-03-12 18:45:36 -0800
commit50c27eab97d5b3196a4912893e48fb36cbf0cc6b (patch)
treec4c8592cdedbaae0204c5d3094b943b123738c83 /services/camera/libcameraservice/CameraService.cpp
parent46da121c84a6f343e262b89a7ec4ac7941d58028 (diff)
parentbc7ce29314a914e467bcbf51db0836d80753a7a1 (diff)
downloadframeworks_av-50c27eab97d5b3196a4912893e48fb36cbf0cc6b.zip
frameworks_av-50c27eab97d5b3196a4912893e48fb36cbf0cc6b.tar.gz
frameworks_av-50c27eab97d5b3196a4912893e48fb36cbf0cc6b.tar.bz2
Merge branch 'dr15' into cm-13.0
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 7c4594f..a560b93 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -153,6 +153,7 @@ void CameraService::onFirstRef()
ALOGE("Could not load camera HAL module: %d (%s)", err, strerror(-err));
logServiceError("Could not load camera HAL module", err);
mNumberOfCameras = 0;
+ mNumberOfNormalCameras = 0;
return;
}