Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955 am: 6ee8154438 am: d757dd038c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888 Change-Id: I410f6690a9c6bb56fbeb42f46110ae01a6387c6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2177,7 +2177,7 @@ extern "C" OEMCryptoResult OEMCrypto_LoadEntitledContentKeys(
|
|||||||
if (pair.fcn->version < 17) {
|
if (pair.fcn->version < 17) {
|
||||||
if (key_array == nullptr) {
|
if (key_array == nullptr) {
|
||||||
return pair.fcn->LoadEntitledContentKeys_V16(
|
return pair.fcn->LoadEntitledContentKeys_V16(
|
||||||
session, message, message_length, key_array_length, nullptr);
|
pair.session, message, message_length, key_array_length, nullptr);
|
||||||
}
|
}
|
||||||
std::vector<OEMCrypto_EntitledContentKeyObject_V16> key_array_v16(
|
std::vector<OEMCrypto_EntitledContentKeyObject_V16> key_array_v16(
|
||||||
key_array_length);
|
key_array_length);
|
||||||
|
|||||||
Reference in New Issue
Block a user