From 13774fd5f6566f8df51b4a5424101fb17ff18f97 Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Wed, 6 Dec 2017 13:57:25 -0800 Subject: [PATCH] Camera: add hardware level check To disallow HAL3 device advertise itself as LEGACY. Test: ran on walleye Change-Id: Ib0b98f32c401566323eee546ee23c7873c00aef0 --- .../VtsHalCameraProviderV2_4TargetTest.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index e4cf9af273..258698020c 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -1905,6 +1905,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()); }