Revert "Skip DRM tests on watches since they don't have DRM."
This reverts commit f9b62aaa3c171a5f6b0b3f6cbf9273c31a011fe4.
No longer needed, for explanation see:
bug: 15110978
Change-Id: Ia6bffd39304d8078f9fb6071b1fe14cd56a483a0
diff --git a/tests/tests/drm/src/android/drm/cts/DRMTest.java b/tests/tests/drm/src/android/drm/cts/DRMTest.java
index e72fe83..bb77668 100644
--- a/tests/tests/drm/src/android/drm/cts/DRMTest.java
+++ b/tests/tests/drm/src/android/drm/cts/DRMTest.java
@@ -18,7 +18,6 @@
import android.content.ContentValues;
-import android.content.pm.PackageManager;
import android.test.AndroidTestCase;
import android.util.Log;
import java.io.IOException;
@@ -61,15 +60,10 @@
}
}
- private boolean deviceSupportsDRM() {
- /* Watches don't support DRM */
- return !getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
- }
-
private void register(Config config) throws Exception {
DrmInfo drmInfo = executeAcquireDrmInfo(DrmInfoRequest.TYPE_REGISTRATION_INFO,
- config.getInfoOfRegistration(),
- config.getMimeType());
+ config.getInfoOfRegistration(),
+ config.getMimeType());
executeProcessDrmInfo(drmInfo, config);
}
@@ -88,106 +82,86 @@
}
public void testIsDrmDirectoryExist() {
- if (deviceSupportsDRM()) {
- assertTrue("/data/drm/ does not exist", new File("/data/drm/").exists());
- }
+ assertTrue("/data/drm/ does not exist", new File("/data/drm/").exists());
}
public void testRegisterAndDeregister() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- register(config);
- deregister(config);
- }
+ for (Config config : mConfigs) {
+ register(config);
+ deregister(config);
}
}
public void testAcquireRights() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- register(config);
- acquireRights(config);
- deregister(config);
- }
+ for (Config config : mConfigs) {
+ register(config);
+ acquireRights(config);
+ deregister(config);
}
}
public void testGetConstraints() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- register(config);
- acquireRights(config);
- ContentValues constraints = mDrmManagerClient.getConstraints(
- config.getContentPath(),
- DrmStore.Action.DEFAULT);
- assertNotNull("Failed on plugin: " + config.getPluginName(), constraints);
- deregister(config);
- }
+ for (Config config : mConfigs) {
+ register(config);
+ acquireRights(config);
+ ContentValues constraints = mDrmManagerClient.getConstraints(
+ config.getContentPath(),
+ DrmStore.Action.DEFAULT);
+ assertNotNull("Failed on plugin: " + config.getPluginName(), constraints);
+ deregister(config);
}
}
public void testCanHandle() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- assertTrue("Failed on plugin: " + config.getPluginName(),
- mDrmManagerClient.canHandle(config.getContentPath(), config.getMimeType()));
- }
+ for (Config config : mConfigs) {
+ assertTrue("Failed on plugin: " + config.getPluginName(),
+ mDrmManagerClient.canHandle(config.getContentPath(), config.getMimeType()));
}
}
public void testGetOriginalMimeType() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- assertNotNull("Failed on plugin: " + config.getPluginName(),
- mDrmManagerClient.getOriginalMimeType(config.getContentPath()));
- }
+ for (Config config : mConfigs) {
+ assertNotNull("Failed on plugin: " + config.getPluginName(),
+ mDrmManagerClient.getOriginalMimeType(config.getContentPath()));
}
}
public void testCheckRightsStatus() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- register(config);
- acquireRights(config);
- int rightsStatus = mDrmManagerClient.checkRightsStatus(
- config.getContentPath(),
- DrmStore.Action.PLAY);
- assertEquals("Failed on plugin: " + config.getPluginName(),
- DrmStore.RightsStatus.RIGHTS_VALID, rightsStatus);
- deregister(config);
- }
+ for (Config config : mConfigs) {
+ register(config);
+ acquireRights(config);
+ int rightsStatus = mDrmManagerClient.checkRightsStatus(
+ config.getContentPath(),
+ DrmStore.Action.PLAY);
+ assertEquals("Failed on plugin: " + config.getPluginName(),
+ DrmStore.RightsStatus.RIGHTS_VALID, rightsStatus);
+ deregister(config);
}
}
public void testRemoveRights() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- assertEquals("Failed on plugin: " + config.getPluginName(),
- DrmManagerClient.ERROR_NONE,
- mDrmManagerClient.removeRights(config.getContentPath()));
- }
+ for (Config config : mConfigs) {
+ assertEquals("Failed on plugin: " + config.getPluginName(),
+ DrmManagerClient.ERROR_NONE,
+ mDrmManagerClient.removeRights(config.getContentPath()));
}
}
public void testRemoveAllRights() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- assertEquals("Failed on plugin: " + config.getPluginName(),
- mDrmManagerClient.removeAllRights(), DrmManagerClient.ERROR_NONE);
- }
+ for (Config config : mConfigs) {
+ assertEquals("Failed on plugin: " + config.getPluginName(),
+ mDrmManagerClient.removeAllRights(), DrmManagerClient.ERROR_NONE);
}
}
public void testConvertData() throws Exception {
- if (deviceSupportsDRM()) {
- for (Config config : mConfigs) {
- byte[] inputData = new byte[]{'T','E','S','T'};
+ for (Config config : mConfigs) {
+ byte[] inputData = new byte[]{'T','E','S','T'};
- int convertId = mDrmManagerClient.openConvertSession(config.getMimeType());
- DrmConvertedStatus drmConvertStatus
- = mDrmManagerClient.convertData(convertId, inputData);
- mDrmManagerClient.closeConvertSession(convertId);
- }
+ int convertId = mDrmManagerClient.openConvertSession(config.getMimeType());
+ DrmConvertedStatus drmConvertStatus
+ = mDrmManagerClient.convertData(convertId, inputData);
+ mDrmManagerClient.closeConvertSession(convertId);
}
}
