commit 2f37ada84083b395c0f525754edb2e2a7be2f073
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 25 10:25:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 25 10:25:21 2018 +0000
tree 994ecb48b527726ba40af0b5dd3376c3c67d027b
parent e6f894bc3db52efb6fe5320c4d39430cce2824b1
parent 8edae5199e125925e407d9a26b0310db1cfbc363

Merge "Camera: Extend camera characteristics test case"

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 439333d..f2a7836 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 @@
                     } 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());
             }