commit 3140fff4f3c7b44c46109d85c27ec3da5e8587bb
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Aug 02 16:26:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 02 16:26:27 2018 -0700
tree ef6792989bbd77bb06926b2092a50f5c27bdd497
parent f06d4203accc96302c5c6e7287bea5fd7a563f08
parent 79cea44239bd275f5f482f39622f08fd82d255f7

resolve merge conflicts of cd02298b46cfb17954555e0f1d324f63085aa204 to oreo-mr1-vts-dev
am: 79cea44239

Change-Id: I29d89c104f5d476c7c6563b16cf5898a3a213b09

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 6a1d91e..a7645e0 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1914,6 +1914,19 @@
                     // characteristics keys we've defined.
                     ASSERT_GT(entryCount, 0u);
                     ALOGI("getCameraCharacteristics metadata entry count is %zu", entryCount);
+
+                    camera_metadata_ro_entry entry;
+                    int retcode = find_camera_metadata_ro_entry(metadata,
+                            ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, &entry);
+                    if ((0 == retcode) && (entry.count > 0)) {
+                        uint8_t hardwareLevel = entry.data.u8[0];
+                        ASSERT_TRUE(
+                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED ||
+                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL ||
+                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_3);
+                    } else {
+                        ADD_FAILURE() << "Get camera hardware level failed!";
+                    }
                 });
                 ASSERT_TRUE(ret.isOk());
             }