Upgrade L3 to v16 and update android makefiles [DO NOT MERGE] am: 2f08c48e94

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12868368

Change-Id: Iacd880e4efcb8bb15247407714b1f6f832b67e1a
This commit is contained in:
Cong Lin
2020-11-05 01:47:34 +00:00
committed by Automerger Merge Worker
14 changed files with 287185 additions and 280634 deletions

View File

@@ -3192,7 +3192,7 @@ class OEMCryptoLoadsCertificateAlternates : public OEMCryptoLoadsCertificate {
OEMCryptoResult sts = provisioning_messages.LoadResponse();
encoded_rsa_key_ = provisioning_messages.encoded_rsa_key();
wrapped_rsa_key_ = provisioning_messages.wrapped_rsa_key();
key_loaded_ = (wrapped_rsa_key_.size() > 0);
key_loaded_ = (sts == OEMCrypto_SUCCESS && wrapped_rsa_key_.size() > 0);
if (force) {
EXPECT_EQ(OEMCrypto_SUCCESS, sts);
EXPECT_EQ(nullptr, find(wrapped_rsa_key_, encoded_rsa_key_));