diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:16:58 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:16:58 -0800 |
| commit | bc7ce29314a914e467bcbf51db0836d80753a7a1 (patch) | |
| tree | f885ff73c75cacfb1db919316126474d9c6f2a85 /services/camera | |
| parent | ba3877845ec7b34fd13393aeed7ad74dcb727a4c (diff) | |
| parent | 9dacf2727c5919faea7cc103eeedfceceeff83b6 (diff) | |
| download | frameworks_av-bc7ce29314a914e467bcbf51db0836d80753a7a1.zip frameworks_av-bc7ce29314a914e467bcbf51db0836d80753a7a1.tar.gz frameworks_av-bc7ce29314a914e467bcbf51db0836d80753a7a1.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/av into cm-13.0
Android 6.0.1 release 22
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 1 |
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; } |