From df6ea9e21eca48f7bb0918ac8a76cab13c45178c Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Tue, 17 Aug 2021 04:49:52 +0000 Subject: [PATCH] Layered Clock interface Merge from Widevine repo of http://go/wvgerrit/131306 which is a Merge of non OPK files from http://go/wvgerrit/129344 and http://go/wvgerrit/129563. The OPK files are squash merged in the CL http://go/wvgerrit/131303. This splits the clock interface into two layers so that we can save the previous value. Bug: 158719238 Change-Id: I473966eb9b0766d27372682e8ebfbcb53f546980 --- libwvdrmengine/cdm/core/test/test_printers.cpp | 3 +++ libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/test/test_printers.cpp b/libwvdrmengine/cdm/core/test/test_printers.cpp index e3400967..0b1b6b1e 100644 --- a/libwvdrmengine/cdm/core/test/test_printers.cpp +++ b/libwvdrmengine/cdm/core/test/test_printers.cpp @@ -1220,6 +1220,9 @@ void PrintTo(const enum OEMCryptoResult& value, ::std::ostream* os) { case OPK_ERROR_REMOTE_CALL: *os << "REMOTE_CALL"; break; + case OPK_ERROR_NO_PERSISTENT_DATA: + *os << "NO_PERSISTENT_DATA"; + break; } } namespace okp { diff --git a/libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h b/libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h index e445a0c2..2715ea27 100644 --- a/libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h +++ b/libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h @@ -100,7 +100,8 @@ typedef enum OEMCryptoResult { /* OPK return values */ OPK_ERROR_BASE = 2000, OPK_ERROR_REMOTE_CALL = OPK_ERROR_BASE, - OPK_ERROR_INCOMPATIBLE_VERSION = OPK_ERROR_BASE + 1 + OPK_ERROR_INCOMPATIBLE_VERSION = OPK_ERROR_BASE + 1, + OPK_ERROR_NO_PERSISTENT_DATA = OPK_ERROR_BASE + 2, } OEMCryptoResult; /* clang-format on */