commit 925a27febcc2be81cb6960b5d0c1bc7d06f502e9
author Jayant Chowdhary <jchowdhary@google.com> Mon Sep 13 16:25:07 2021 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Wed Sep 15 10:15:13 2021 -0700
tree dee118019860f9bb2906a6b17be04c692f7539c2
parent a9e60472c0b3f1510b6b8727db2ac72a35abb5b6

cameraserver hidl: Skip vendor ids with tag count <=0 for getCameraVendorTagSections.

Bug: 199420805

Test: Use getCameraVendorTagSections on devices where a provider returns -1 for getTagCount via vndk

Change-Id: I29f23b6771168ec19c693b2a443f1c9a3fe4c13d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/hidl/HidlCameraService.cpp

diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.cpp b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
index 7d1b3cf..a812587 100644
--- a/services/camera/libcameraservice/hidl/HidlCameraService.cpp
+++ b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
@@ -279,6 +279,9 @@
         size_t numSections = sectionNames->size();
         std::vector<std::vector<HVendorTag>> tagsBySection(numSections);
         int tagCount = desc->getTagCount();
+        if (tagCount <= 0) {
+            continue;
+        }
         std::vector<uint32_t> tags(tagCount);
         desc->getTagArray(tags.data());
         for (int i = 0; i < tagCount; i++) {