commit d8871d6235f650da3064a2f0985133daf7003004
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed Nov 13 21:09:02 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 13 21:09:02 2019 +0000
tree c1a7710d99dc37964f3267c3020f6e8c107cd0eb
parent 5f90592665674a11340a3a0f13d53969f28b378d
parent 2d05a2d0f13a26e2e2d5ccfa321f834e415cfad7

Merge "Snap for 6005827 from f0463aa1d7c34561e89040d03e9840723a61918c to android10-tests-release" into android10-tests-release

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

diff --git a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
index 0e20b47..5e28750 100644
--- a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
+++ b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
@@ -124,6 +124,13 @@
         mTimestampUs = 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";
     }