From 8edae5199e125925e407d9a26b0310db1cfbc363 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Tue, 18 Sep 2018 14:27:13 +0100 Subject: [PATCH] Camera: Extend camera characteristics test case Verify that device implementations do not set the new privacy characteristics key: ANDROID_REQUEST_CHARACTERISTIC_KEYS_NEEDING_PERMISSION As required by API contract. Bug: 112160024 Bug: 115969437 Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO Change-Id: I8d8f0d0e1cdec24117d47e7ae45602f56573376f --- .../vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 439333d9ca..f2a7836cd7 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -2080,6 +2080,14 @@ TEST_F(CameraHidlTest, getCameraCharacteristics) { } else { ADD_FAILURE() << "Get camera hardware level failed!"; } + + entry.count = 0; + retcode = find_camera_metadata_ro_entry(metadata, + ANDROID_REQUEST_CHARACTERISTIC_KEYS_NEEDING_PERMISSION, &entry); + if ((0 == retcode) || (entry.count > 0)) { + ADD_FAILURE() << "ANDROID_REQUEST_CHARACTERISTIC_KEYS_NEEDING_PERMISSION " + << " per API contract should never be set by Hal!"; + } }); ASSERT_TRUE(ret.isOk()); }