resolve merge conflicts of cd02298b46 to oreo-mr1-vts-dev

am: 79cea44239

Change-Id: I29d89c104f5d476c7c6563b16cf5898a3a213b09
This commit is contained in:
Yin-Chia Yeh
2018-08-02 16:26:27 -07:00
committed by android-build-merger

View File

@@ -1914,6 +1914,19 @@ TEST_F(CameraHidlTest, getCameraCharacteristics) {
// 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());
}