commit 4ef690a38b1dfdff3ae34e260435edcec37e520f
author Gloria Wang <gwang@google.com> Wed Mar 02 17:06:16 2011 -0800
committer Gloria Wang <gwang@google.com> Wed Mar 02 17:06:16 2011 -0800
tree b9eba3a34c80f85fb3c709b14df8e5687db1c111
parent 0528bc77948e49bd75cfd4082fb8fef3a7238626

Do not call processDrmInfo if acquireDrmInfo returns null

Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673

drm/java/android/drm/DrmManagerClient.java

diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java
index 6caf678..c541456 100644
--- a/drm/java/android/drm/DrmManagerClient.java
+++ b/drm/java/android/drm/DrmManagerClient.java
@@ -479,6 +479,9 @@
      */
     public int acquireRights(DrmInfoRequest drmInfoRequest) {
         DrmInfo drmInfo = acquireDrmInfo(drmInfoRequest);
+        if (null == drmInfo) {
+            return ERROR_UNKNOWN;
+        }
         return processDrmInfo(drmInfo);
     }