diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-11 18:33:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-11 18:33:25 +0000 |
| commit | 2528c405f3164c24f6dbf351b904f27265a5e9a8 (patch) | |
| tree | 035d79ec3a4715642164a3f7d571cd5698212196 /cas | |
| parent | 0b9f25d5c9eadb5eda353f5cc01a8bd2d05cf5f2 (diff) | |
| parent | 6d176aa77d6ad36174de843f9de4e979807566ce (diff) | |
| download | android_hardware_interfaces-2528c405f3164c24f6dbf351b904f27265a5e9a8.tar.gz android_hardware_interfaces-2528c405f3164c24f6dbf351b904f27265a5e9a8.tar.bz2 android_hardware_interfaces-2528c405f3164c24f6dbf351b904f27265a5e9a8.zip | |
Merge "Added VTS tests for requiresSecureDecoderComponent and release API" into oc-mr1-dev
Diffstat (limited to 'cas')
| -rw-r--r-- | cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp b/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp index 4a6ccd764..d3b0f1da3 100644 --- a/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp +++ b/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp @@ -468,6 +468,8 @@ TEST_F(MediaCasHidlTest, TestClearKeyApis) { EXPECT_TRUE(returnStatus.isOk()); EXPECT_EQ(Status::OK, returnStatus); + EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("video/avc")); + sp<IDescrambler> descrambler; descrambler = IDescrambler::castFrom(mDescramblerBase); ASSERT_NE(descrambler, nullptr); @@ -485,6 +487,14 @@ TEST_F(MediaCasHidlTest, TestClearKeyApis) { memcmp(static_cast<const void*>(opBuffer), static_cast<const void*>(kOutRefBinaryBuffer), sizeof(kOutRefBinaryBuffer)); EXPECT_EQ(0, compareResult); + + returnStatus = mDescramblerBase->release(); + EXPECT_TRUE(returnStatus.isOk()); + EXPECT_EQ(Status::OK, returnStatus); + + returnStatus = mMediaCas->release(); + EXPECT_TRUE(returnStatus.isOk()); + EXPECT_EQ(Status::OK, returnStatus); } TEST_F(MediaCasHidlTest, TestClearKeySessionClosedAfterRelease) { @@ -595,6 +605,12 @@ TEST_F(MediaCasHidlTest, TestClearKeyErrors) { ASSERT_TRUE(descrambleTestInputBuffer(descrambler, &descrambleStatus, &dataMemory)); EXPECT_EQ(Status::ERROR_CAS_DECRYPT, descrambleStatus); + + // Verify that requiresSecureDecoderComponent handles empty mime + EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("")); + + // Verify that requiresSecureDecoderComponent handles invalid mime + EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("bad")); } } // anonymous namespace |