Merge "DRM vts test bug fixes" into oc-dev

am: ca7205fa61

Change-Id: I873889b274818b27064f32467828ac18c14c9c92
This commit is contained in:
Jeff Tinker
2017-04-13 18:08:32 +00:00
committed by android-build-merger

View File

@@ -953,6 +953,7 @@ TEST_P(DrmHalVendorPluginTest, ListenerKeysChange) {
EXPECT_TRUE(result.args);
EXPECT_EQ(sessionId, result.args->sessionId);
EXPECT_EQ(keyStatusList, result.args->keyStatusList);
closeSession(sessionId);
}
/**
@@ -1429,7 +1430,7 @@ TEST_P(DrmHalVendorDecryptTest, AttemptDecryptWithKeysRemoved) {
uint32_t byteCount = decrypt(Mode::AES_CTR, key.isSecure,
toHidlArray(key.keyId), &iv[0], subSamples, noPattern,
key.clearContentKey, Status::ERROR_DRM_DECRYPT);
key.clearContentKey, Status::ERROR_DRM_NO_LICENSE);
EXPECT_EQ(0u, byteCount);
closeSession(sessionId);