Merge changes from topic "presubmit-am-69964c88cf1f4ba9b4fac91dde2f2412" into tm-mainline-prod

* changes:
  [automerge] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c
  Update cipher mode enumeration in AIDL WvDrmPlugin
This commit is contained in:
Robert Shih
2022-02-22 20:22:11 +00:00
committed by Android (Google) Code Review

View File

@@ -25,7 +25,7 @@ class WVGenericCryptoInterface {
const uint8_t* key_id,
size_t key_id_length) {
return OEMCrypto_SelectKey(session, key_id, key_id_length,
OEMCrypto_CipherMode_CBC);
OEMCrypto_CipherMode_CBCS);
}
virtual OEMCryptoResult encrypt(OEMCrypto_SESSION session,