commit fedde0ea526dfb5d5b280ecf20fe7be94aaf2dbd
author Pawin Vongmasa <pawin@google.com> Fri Jul 13 01:40:58 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 13 01:40:58 2018 -0700
tree 35e79ac29d5c34291ab13c3719aae937124e8b33
parent 54eb2c126d1595eb92ed05415cddb0d1c1535a02
parent c0243f2ff85d3d8d897f34d063177169e736a500

resolve merge conflicts of b92f1d2e1be35b331b18589a8cde81d51ddd31d6 to oreo-mr1-vts-dev
am: c0243f2ff8

Change-Id: Ic39fb2e88c6d0d1c1185dae1fab6d9c42a624187

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp

diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
index 38cdcd6..0b661c9 100644
--- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
+++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
@@ -225,6 +225,15 @@
         framesReceived = 0;
         timestampUs = 0;
         timestampDevTest = false;
+        isSecure = false;
+        size_t suffixLen = strlen(".secure");
+        if (strlen(gEnv->getComponent().c_str()) >= suffixLen) {
+            isSecure =
+                !strcmp(gEnv->getComponent().c_str() +
+                            strlen(gEnv->getComponent().c_str()) - suffixLen,
+                        ".secure");
+        }
+        if (isSecure) disableTest = true;
         if (disableTest) std::cout << "[   WARN   ] Test Disabled \n";
     }
 
@@ -321,6 +330,7 @@
     OMX_AUDIO_CODINGTYPE eEncoding;
     bool disableTest;
     bool eosFlag;
+    bool isSecure;
     uint32_t framesReceived;
     uint64_t timestampUs;
     ::android::List<uint64_t> timestampUslist;