commit 995e83cf95d53b43706363fb63bf22d2d1787270
author Jeff Tinker <jtinker@google.com> Tue Jun 17 22:15:37 2014 +0000
committer Jeff Tinker <jtinker@google.com> Tue Jun 17 22:18:58 2014 +0000
tree 9a40755b3940c7f580053e32018b7c78bc7820d1
parent 4565d632f59f13c94c5c70c6e08fb190e08a4bbe

Revert "Also Skip DRM setup on devices that don't have DRM"

This reverts commit 4565d632f59f13c94c5c70c6e08fb190e08a4bbe.

No longer needed, for explanation see:
bug: 15110978

Change-Id: If0a868b5893046aec323c376a60070303960442c

tests/tests/drm/src/android/drm/cts/DRMTest.java

diff --git a/tests/tests/drm/src/android/drm/cts/DRMTest.java b/tests/tests/drm/src/android/drm/cts/DRMTest.java
index bd4291d..e72fe83 100644
--- a/tests/tests/drm/src/android/drm/cts/DRMTest.java
+++ b/tests/tests/drm/src/android/drm/cts/DRMTest.java
@@ -49,17 +49,14 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        mDrmManagerClient = new DrmManagerClient(getContext());
+        String[] plugins = mDrmManagerClient.getAvailableDrmEngines();
 
-        if (deviceSupportsDRM()) {
-            mDrmManagerClient = new DrmManagerClient(getContext());
-            String[] plugins = mDrmManagerClient.getAvailableDrmEngines();
-
-            mConfigs.clear();
-            for(String plugInName : plugins) {
-                Config config = ConfigFactory.getConfig(plugInName);
-                if (null != config) {
-                    mConfigs.add(config);
-                }
+        mConfigs.clear();
+        for(String plugInName : plugins) {
+            Config config = ConfigFactory.getConfig(plugInName);
+            if (null != config) {
+                mConfigs.add(config);
             }
         }
     }