Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 13:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "camera.provider default: Don't stop init if vendor tags are bad."

Browse Source
This commit is contained in:
Eino-Ville Talvala
2017-02-10 22:04:47 +00:00
committed by Android (Google) Code Review
parent fb75f8faac 0f5eb837fe
commit 305f0dd8a2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camera/provider/2.4/default/CameraProvider.cpp
View File

@@ -234,8 +234,10 @@ bool CameraProvider::initialize() {
// Setup vendor tags here so HAL can setup vendor keys in camera characteristics
VendorTagDescriptor::clearGlobalVendorTagDescriptor();
bool setupSucceed = setUpVendorTags();
return !setupSucceed; // return flag here is mInitFailed
if (!setUpVendorTags()) {
ALOGE("%s: Vendor tag setup failed, will not be available.", __FUNCTION__);
}
return false; // mInitFailed
}
bool CameraProvider::setUpVendorTags() {
@@ -245,7 +247,7 @@ bool CameraProvider::setUpVendorTags() {
// Check if vendor operations have been implemented
if (!mModule->isVendorTagDefined()) {
ALOGI("%s: No vendor tags defined for this device.", __FUNCTION__);
return false;
return true;
}
mModule->getVendorTagOps(&vOps);