From 0f5eb837fe84053f4845e19157d81e0ce7da6372 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Thu, 9 Feb 2017 19:45:31 -0800 Subject: [PATCH] camera.provider default: Don't stop init if vendor tags are bad. And definitely don't stop init if there are no vendor tags defined at all. Instead, just log about it. Test: gce camera HAL init succeeds; no regression to sailfish camera Bug: 35036220 Change-Id: I7f4481d7ec1a88df0c67a66c364f351b3321b221 --- camera/provider/2.4/default/CameraProvider.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/camera/provider/2.4/default/CameraProvider.cpp b/camera/provider/2.4/default/CameraProvider.cpp index f1a66a815f..f3ba201d7f 100644 --- a/camera/provider/2.4/default/CameraProvider.cpp +++ b/camera/provider/2.4/default/CameraProvider.cpp @@ -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);