commit aa2e608a99083261cf60da0ee44068f6e0b605c3
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 20 19:39:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 20 19:39:55 2020 +0000
tree 645d9a59ba2c645507bad49a5e2c6cf62cad2e8c
parent 4275231c8d1bc8e51c2238306e51e9d8fc6b93e9
parent 8448c4b30b45b04cb615e6114015bb34f1619da2

Merge changes from topic "audio-hal-7"

* changes:
  Add Audio Policy Manager config files for HAL V7.0
  Temporarily disable Audio HAL V7 modules
  Add Audio HAL V7

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp

diff --git a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp
index ecaf3a8..5bcea5b 100644
--- a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp
+++ b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp
@@ -107,6 +107,13 @@
         mOutputSize = 0u;
         mTimestampDevTest = false;
         if (mCompName == unknown_comp) mDisableTest = true;
+
+        C2SecureModeTuning secureModeTuning{};
+        mComponent->query({&secureModeTuning}, {}, C2_MAY_BLOCK, nullptr);
+        if (secureModeTuning.value == C2Config::SM_READ_PROTECTED) {
+            mDisableTest = true;
+        }
+
         if (mDisableTest) std::cout << "[   WARN   ] Test Disabled \n";
     }