summaryrefslogtreecommitdiff
path: root/camera/QCamera2/QCamera2Factory.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2017-10-04 17:37:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-04 17:37:04 +0000
commit71bd138fb58cf62efb5a8d9e9c242fe2d367f0cd (patch)
tree1b7c866073c3a8304d66c8cc465d235fdcb56413 /camera/QCamera2/QCamera2Factory.cpp
parent911890b56fb945341582491c252665f03cbd5790 (diff)
parent9b6b64dbbf2816e68413311f8af6b4b13508efc3 (diff)
downloadbullhead-71bd138fb58cf62efb5a8d9e9c242fe2d367f0cd.tar.gz
Merge "QCamera2: HAL3: Extend available request/result/charact. keys" into oc-mr1-devoreo-mr1-dev
Diffstat (limited to 'camera/QCamera2/QCamera2Factory.cpp')
-rw-r--r--camera/QCamera2/QCamera2Factory.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/camera/QCamera2/QCamera2Factory.cpp b/camera/QCamera2/QCamera2Factory.cpp
index 676dd65..6101036 100644
--- a/camera/QCamera2/QCamera2Factory.cpp
+++ b/camera/QCamera2/QCamera2Factory.cpp
@@ -58,7 +58,6 @@ QCamera2Factory *gQCamera2Factory = NULL;
*==========================================================================*/
QCamera2Factory::QCamera2Factory()
{
- camera_info info;
mHalDescriptors = NULL;
mCallbacks = NULL;
mNumOfCameras = get_num_of_cameras();
@@ -78,10 +77,6 @@ QCamera2Factory::QCamera2Factory()
} else {
mHalDescriptors[i].device_version = CAMERA_DEVICE_API_VERSION_1_0;
}
- //Query camera at this point in order
- //to avoid any delays during subsequent
- //calls to 'getCameraInfo()'
- getCameraInfo(i, &info);
}
} else {
ALOGE("%s: Not enough resources to allocate HAL descriptor table!",