Address request license test failures

[ Merge of http://go/wvgerrit/81743 and http://go/ag/7747989 ]

This fixes some failures in tests. A platform property has been added
which controls whether an offline license can be restored if a release
request has been previously made. This behaviour was introduced by
CE CDM in b/113167010 but is not permitted for android.

The tests failures addressed are
* ProvisioningTestWithServiceCertificate
* ReleaseRetryOfflineKeyTest
* ReleaseRetryL3OfflineKeyTest
* ReleaseRetryL3OfflineKeySessionUsageDisable

Bug: 119428680
Bug: 133684744
Test: WV unit/integration tests
Change-Id: I5beacecea32f26c8a319a6d73a45cc36f04d8aa1
This commit is contained in:
Rahul Frias
2019-05-27 02:46:47 -07:00
parent 435f839f7e
commit 57f2a7fe31
6 changed files with 17 additions and 30 deletions

View File

@@ -55,6 +55,9 @@ class Properties {
static inline bool device_files_is_a_real_filesystem() {
return device_files_is_a_real_filesystem_;
}
static inline bool allow_restore_of_offline_licenses_with_release() {
return allow_restore_of_offline_licenses_with_release_;
}
static void set_provisioning_messages_are_binary(bool flag) {
provisioning_messages_are_binary_ = flag;
}
@@ -143,6 +146,7 @@ class Properties {
static bool provisioning_messages_are_binary_;
static bool allow_service_certificate_requests_;
static bool device_files_is_a_real_filesystem_;
static bool allow_restore_of_offline_licenses_with_release_;
static std::unique_ptr<CdmClientPropertySetMap> session_property_set_;
CORE_DISALLOW_COPY_AND_ASSIGN(Properties);