widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address merge comments" into oc-dev am: dbaacf9232

Browse Source 
am: 565d911792

Change-Id: I8ea37fe2f027886252f2bed9b525a7c69de261b0
This commit is contained in:
Fred Gylys-Colwell
2017-04-12 00:38:41 +00:00
committed by android-build-merger
parent 158769ce28 565d911792
commit 87040f8157
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -45,17 +45,17 @@ using namespace std;
using std::tr1::tuple; using std::tr1::tuple;
namespace std { // GTest wants PrintTo to be in the std namespace. namespace std { // GTest wants PrintTo to be in the std namespace.
void PrintTo(const tuple<OEMCrypto_CENCEncryptPatternDesc, void PrintTo(const tuple<OEMCrypto_CENCEncryptPatternDesc, OEMCryptoCipherMode,
OEMCryptoCipherMode, bool>& param, ostream* os) { bool>& param,
ostream* os) {
OEMCrypto_CENCEncryptPatternDesc pattern = std::tr1::get<0>(param); OEMCrypto_CENCEncryptPatternDesc pattern = std::tr1::get<0>(param);
OEMCryptoCipherMode mode = std::tr1::get<1>(param); OEMCryptoCipherMode mode = std::tr1::get<1>(param);
bool decrypt_inplace = std::tr1::get<2>(param); bool decrypt_inplace = std::tr1::get<2>(param);
*os << ((mode == OEMCrypto_CipherMode_CTR) ? "CTR mode" : "CBC mode") *os << ((mode == OEMCrypto_CipherMode_CTR) ? "CTR mode" : "CBC mode")
<< ", encrypt=" << pattern.encrypt << ", encrypt=" << pattern.encrypt << ", skip=" << pattern.skip
<< ", skip=" << pattern.skip
<< ", decrypt in place = " << (decrypt_inplace ? "true" : "false"); << ", decrypt in place = " << (decrypt_inplace ? "true" : "false");
} }
} } // namespace std
namespace wvoec { namespace wvoec {
@@ -5246,7 +5246,8 @@ TEST_F(UsageTableDefragTest, CreateNewHeaderWhileUsingOldOne) {
LoadFirstLicense(&s1, 1); LoadFirstLicense(&s1, 1);
s0.open(); s0.open();
ASSERT_NO_FATAL_FAILURE(s0.ReloadUsageEntry()); ASSERT_NO_FATAL_FAILURE(s0.ReloadUsageEntry());
ASSERT_NO_FATAL_FAILURE(CreateUsageTableHeader(/* expect_success */ false)); const bool kExpectFailure = false;
ASSERT_NO_FATAL_FAILURE(CreateUsageTableHeader(kExpectFailure));
} }
TEST_F(UsageTableDefragTest, ReloadUsageEntryWrongIndex) { TEST_F(UsageTableDefragTest, ReloadUsageEntryWrongIndex) {