summaryrefslogtreecommitdiff
path: root/drm/common/IDrmManagerService.cpp
diff options
context:
space:
mode:
author Gloria Wang <gwang@google.com> 2011-06-23 09:33:11 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-06-23 09:33:11 -0700
commitb59f67761155cfa696e9f7cadb83e4f645a55212 (patch)
tree615d6b0a0757158346b12364cb61a666e771f002 /drm/common/IDrmManagerService.cpp
parentdb262e6cf072a0ebbf2b67aceb37ce9d5ba87b08 (diff)
parentb7e7bdfe784959ac8615851c2741eb9518a5afcf (diff)
Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle."
Diffstat (limited to 'drm/common/IDrmManagerService.cpp')
-rw-r--r--drm/common/IDrmManagerService.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index 458f1b6d1d87..2d8e877b97d1 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -107,6 +107,7 @@ static void clearDecryptHandle(DecryptHandle* handle) {
handle->decryptInfo = NULL;
}
handle->copyControlVector.clear();
+ handle->extendedData.clear();
}
int BpDrmManagerService::addUniqueId(int uniqueId) {