commit 0644c53cc7d51a77e46e32d3cb14f7f767407e0f
author Gloria Wang <gwang@google.com> Wed May 18 13:21:41 2011 -0700
committer Gloria Wang <gwang@google.com> Wed May 18 13:34:43 2011 -0700
tree 5f7d50d6e2a1df339b7f856913e38b181cb1c5c6
parent a319f2d99188c68dab7129a489ba1c01c56b626d

Do not assert when drmInfo is null, because some DRM plugins
do not use acquireDrmInfo()/processDrmInfo() API.
Fix for bug 4449610.

Change-Id: I5401ee7e8ac90d0c80bbb5b12c506036d29b088d

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 c43bf4b..1d2d320 100644
--- a/tests/tests/drm/src/android/drm/cts/DRMTest.java
+++ b/tests/tests/drm/src/android/drm/cts/DRMTest.java
@@ -178,7 +178,9 @@
     }
 
     private void executeProcessDrmInfo(DrmInfo drmInfo, Config config) throws Exception {
-        assertNotNull("Failed on plugin: " + config.getPluginName(), drmInfo);
+        if (drmInfo == null) {
+            return;
+        }
 
         mDrmManagerClient.setOnEventListener(new OnEventListenerImpl(config));
         drmInfo.put(DrmInfoRequest.ACCOUNT_ID, config.getAccountId());