Added CDM support for Watermarking reporting.
[ Merge of http://go/wvgerrit/148552 ] Extended the CDM layer to report OEMCrypto's watermarking support. The reporting of watermarking comes in three (3) mechanisms: 1) ClientCapabilities in license requests 2) CryptoSession metrics when queried to OEMCrypto 3) String property query by apps If OEMCrypto implementents OEMCrypto_GetWatermarkingSupport(), then the reported watermarking support by the CDM will match that of OEMCrypto. If OEMCrypto does not implement OEMCrypto_GetWatermarkingSupport() or an error occurs, it is assumed that OEMCrypto does not support watermarking, and the CDM will report "Not Supported". Bug: 226443788 Test: run_x86_64_tests request_license_test and license_unittest Change-Id: Id929a356c395e6bcf45d371ee6887eec40d35329
This commit is contained in:
@@ -1149,6 +1149,8 @@ Status WVDrmPlugin::unprovisionDevice() {
|
||||
} else {
|
||||
value = kDisable;
|
||||
}
|
||||
} else if (name == "watermarkingSupport") {
|
||||
status = queryProperty(wvcdm::QUERY_KEY_WATERMARKING_SUPPORT, value);
|
||||
} else {
|
||||
ALOGE("App requested unknown string property %s", name.c_str());
|
||||
*_aidl_return = value;
|
||||
|
||||
@@ -1259,6 +1259,8 @@ Return<void> WVDrmPlugin::getPropertyString(const hidl_string& propertyName,
|
||||
} else {
|
||||
value = kDisable;
|
||||
}
|
||||
} else if (name == "watermarkingSupport") {
|
||||
status = queryProperty(wvcdm::QUERY_KEY_WATERMARKING_SUPPORT, value);
|
||||
} else {
|
||||
ALOGE("App requested unknown string property %s", name.c_str());
|
||||
status = Status::ERROR_DRM_CANNOT_HANDLE;
|
||||
|
||||
Reference in New Issue
Block a user