| commit | 21df9aaf9eb351d415d130f72ac2a9daee2d26f4 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri May 09 17:32:11 2014 +0000 |
| committer | Jeff Tinker <jtinker@google.com> | Tue Nov 22 14:41:15 2016 -0800 |
| tree | dde1a9741d89b548956c36453e56d544e022a6ee | |
| parent | 4782abf7e1b0c07c59fa324755b73ac6b55e4ad3 [diff] |
Revert "Apply requested DRM info test changes" Bug: 14663119 This reverts commit a1ed7edca2c18d171a5db1dbe72ab1a74bb8e23e. Change-Id: I6d922995f84bbd074745996b827833a71b169f34
diff --git a/tests/tests/drm/src/android/drm/cts/DrmInfoRequestTest.java b/tests/tests/drm/src/android/drm/cts/DrmInfoRequestTest.java index 02894d4..cedc2d5 100644 --- a/tests/tests/drm/src/android/drm/cts/DrmInfoRequestTest.java +++ b/tests/tests/drm/src/android/drm/cts/DrmInfoRequestTest.java
@@ -31,6 +31,8 @@ public static void testInvalidInfoTypes() throws Exception { checkInvalidInfoType(DrmInfoRequest.TYPE_REGISTRATION_INFO - 1); + checkInvalidInfoType( + DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO + 1); } public static void testValidInfoTypes() throws Exception {
diff --git a/tests/tests/drm/src/android/drm/cts/DrmInfoStatusTest.java b/tests/tests/drm/src/android/drm/cts/DrmInfoStatusTest.java index cecd558..103bd6e 100644 --- a/tests/tests/drm/src/android/drm/cts/DrmInfoStatusTest.java +++ b/tests/tests/drm/src/android/drm/cts/DrmInfoStatusTest.java
@@ -30,6 +30,7 @@ DrmInfoRequest.TYPE_REGISTRATION_INFO; public static void testInvalidStatusCodes() throws Exception { + checkInvalidStatusCode(DrmInfoStatus.STATUS_ERROR + 1); checkInvalidStatusCode(DrmInfoStatus.STATUS_OK - 1); }
diff --git a/tests/tests/drm/src/android/drm/cts/DrmInfoTest.java b/tests/tests/drm/src/android/drm/cts/DrmInfoTest.java index 7a498a6..656df5b 100644 --- a/tests/tests/drm/src/android/drm/cts/DrmInfoTest.java +++ b/tests/tests/drm/src/android/drm/cts/DrmInfoTest.java
@@ -33,6 +33,8 @@ public static void testInvalidInfoTypes() throws Exception { checkInvalidInfoType(DrmInfoRequest.TYPE_REGISTRATION_INFO - 1); + checkInvalidInfoType( + DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO + 1); } public static void testValidInfoTypes() throws Exception {