Merge "Change an ASSERT to an EXPECT" into nyc-dev

am: 45eeeed

* commit '45eeeed44490d0bc00b396d8276ed5231b4a662b':
  Change an ASSERT to an EXPECT
This commit is contained in:
Fred Gylys-Colwell
2016-03-22 17:32:28 +00:00
committed by android-build-merger

View File

@@ -3389,7 +3389,7 @@ class OEMCryptoLoadsCertificateAlternates : public OEMCryptoLoadsCertificate {
&signature_length, scheme); &signature_length, scheme);
} }
ASSERT_NE(OEMCrypto_SUCCESS, sts) EXPECT_NE(OEMCrypto_SUCCESS, sts)
<< "Signed with forbidden padding scheme=" << (int)scheme << "Signed with forbidden padding scheme=" << (int)scheme
<< ", size=" << (int)size; << ", size=" << (int)size;
vector<uint8_t> zero(signature_length, 0); vector<uint8_t> zero(signature_length, 0);