Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Amend drm@1.2 vts mock errors

Browse Source 
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: I05cc92d33a50b37ce12d8295cdd129d2653836d1
This commit is contained in:
Robert Shih
2019-03-08 15:15:38 -08:00
parent b45f700b34
commit 4add15d0c9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drm/1.2/vts/functional/drm_hal_test.cpp
View File

@@ -41,8 +41,8 @@ using ::android::hardware::hidl_string;
static const char* const kVideoMp4 = "video/mp4";
static const char* const kBadMime = "video/unknown";
static const char* const kDrmErrorTestKey = "drmErrorTest";
static const char* const kDrmErrorGeneric = "";
static const char* const kResourceContentionValue = "resourceContention";
static const char* const kDrmErrorInvalidState = "invalidState";
static const char* const kDrmErrorResourceContention = "resourceContention";
static const SecurityLevel kSwSecureCrypto = SecurityLevel::SW_SECURE_CRYPTO;
/**
@@ -380,7 +380,7 @@ TEST_P(DrmHalClearkeyTest, BadLevelNotSupported) {
* Test resource contention during attempt to generate key request
*/
TEST_P(DrmHalClearkeyTest, GetKeyRequestResourceContention) {
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kResourceContentionValue);
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorResourceContention);
EXPECT_EQ(Status::OK, status);
auto sessionId = openSession();
hidl_vec<uint8_t> initData;
@@ -403,7 +403,7 @@ TEST_P(DrmHalClearkeyTest, GetKeyRequestResourceContention) {
TEST_P(DrmHalClearkeyTest, OfflineLicenseInvalidState) {
auto sessionId = openSession();
hidl_vec<uint8_t> keySetId = loadKeys(sessionId, KeyType::OFFLINE);
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorGeneric);
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorInvalidState);
EXPECT_EQ(Status::OK, status);
// everything should start failing
@@ -426,7 +426,7 @@ TEST_P(DrmHalClearkeyTest, SessionLostState) {
auto res = drmPlugin->setListener(listener);
EXPECT_OK(res);
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorGeneric);
Status status = drmPlugin->setPropertyString(kDrmErrorTestKey, kDrmErrorInvalidState);
EXPECT_EQ(Status::OK, status);
auto sessionId = openSession();