Merge "Part of Qualcomm L1 OEMCrypto integration" into jb-mr2-dev

2013-04-22 23:20:14 +00:00
parent a2eeb8abf7 39ea1df671
commit 039822d4cb
14 changed files with 2036 additions and 1389 deletions
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -545,7 +545,7 @@ TEST_F(WvCdmRequestLicenseTest, PartialBlockWithOffsetDecryptionTest) {
                                         0));

  EXPECT_TRUE(std::equal(data.decrypt_data.begin(), data.decrypt_data.end(),
-      decrypt_buffer.begin()));
+                         decrypt_buffer.begin()));

  decryptor_.CloseSession(session_id_);
 }