From 4ef690a38b1dfdff3ae34e260435edcec37e520f Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Wed, 2 Mar 2011 17:06:16 -0800 Subject: Do not call processDrmInfo if acquireDrmInfo returns null Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673 --- drm/java/android/drm/DrmManagerClient.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index 6caf678d8558..c541456cd92a 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -479,6 +479,9 @@ public class DrmManagerClient { */ public int acquireRights(DrmInfoRequest drmInfoRequest) { DrmInfo drmInfo = acquireDrmInfo(drmInfoRequest); + if (null == drmInfo) { + return ERROR_UNKNOWN; + } return processDrmInfo(drmInfo); } -- cgit v1.2.3-59-g8ed1b