| commit | d3f9e15a0e239e83f2d79bb159fc3bbe56d97dac | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 13 00:08:39 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 13 00:08:40 2016 +0000 |
| tree | a628054316caf5235ab7373265b7cfc1a12f554a | |
| parent | cf8c9298e24c5b769afe9ec7c89d888587c322e4 [diff] | |
| parent | 21df9aaf9eb351d415d130f72ac2a9daee2d26f4 [diff] |
Merge "Revert "Apply requested DRM info test changes"" into nougat-cts-dev
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 {