diff options
| author | Robert Shih <robertshih@google.com> | 2019-03-08 15:15:38 -0800 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2019-03-08 15:19:54 -0800 |
| commit | 4add15d0c99a9cebf219e97043b144b586c2a75c (patch) | |
| tree | 8f2a059f1bca0ad86a9660b91cd9fd8da2d42f19 /drm | |
| parent | b45f700b340ce149841d64f9fa53d910d6b9a75c (diff) | |
| download | android_hardware_interfaces-4add15d0c99a9cebf219e97043b144b586c2a75c.tar.gz android_hardware_interfaces-4add15d0c99a9cebf219e97043b144b586c2a75c.tar.bz2 android_hardware_interfaces-4add15d0c99a9cebf219e97043b144b586c2a75c.zip | |
Amend drm@1.2 vts mock errors
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: I05cc92d33a50b37ce12d8295cdd129d2653836d1
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/1.2/vts/functional/drm_hal_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drm/1.2/vts/functional/drm_hal_test.cpp b/drm/1.2/vts/functional/drm_hal_test.cpp index 067b5e474..f37adaf31 100644 --- a/drm/1.2/vts/functional/drm_hal_test.cpp +++ b/drm/1.2/vts/functional/drm_hal_test.cpp @@ -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(); |