diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-02 19:50:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 19:50:41 -0800 |
| commit | 6c1bebe33e42e584951314116b7b370ebc32aa64 (patch) | |
| tree | eb230389429a661ec438b5cd99d5f7f30031b284 /drm | |
| parent | 2da0c5826df40d9f528bfe7d2e762c3fbea03f7f (diff) | |
| parent | 4ef690a38b1dfdff3ae34e260435edcec37e520f (diff) | |
| download | frameworks_base-6c1bebe33e42e584951314116b7b370ebc32aa64.zip frameworks_base-6c1bebe33e42e584951314116b7b370ebc32aa64.tar.gz frameworks_base-6c1bebe33e42e584951314116b7b370ebc32aa64.tar.bz2 | |
Merge "Do not call processDrmInfo if acquireDrmInfo returns null"
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 class DrmManagerClient { */ public int acquireRights(DrmInfoRequest drmInfoRequest) { DrmInfo drmInfo = acquireDrmInfo(drmInfoRequest); + if (null == drmInfo) { + return ERROR_UNKNOWN; + } return processDrmInfo(drmInfo); } |