am b879cc6c: Merge "Fix QueryKeyControl Unit Test" into mnc-dev

* commit 'b879cc6c3a5518a2cf7f7d461bdf9860d0c53c57':
  Fix QueryKeyControl Unit Test
This commit is contained in:
Fred Gylys-Colwell
2015-06-18 00:02:50 +00:00
committed by Android Git Automerger

View File

@@ -2291,7 +2291,7 @@ TEST_F(OEMCryptoSessionTests, QueryKeyControl) {
size_t size = sizeof(block) - 1;
OEMCryptoResult sts = OEMCrypto_QueryKeyControl(
s.session_id(), s.license().keys[0].key_id,
sizeof(s.license().keys[0].key_id), reinterpret_cast<uint8_t*>(&block),
s.license().keys[0].key_id_length, reinterpret_cast<uint8_t*>(&block),
&size);
if (sts == OEMCrypto_ERROR_NOT_IMPLEMENTED) {
return;