summaryrefslogtreecommitdiff
path: root/drm/common/DrmInfoStatus.cpp
diff options
context:
space:
mode:
author Gloria Wang <gwang@google.com> 2010-11-02 14:59:51 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-11-02 14:59:51 -0700
commita8d7b7477d99dd2671e6232e157da9954bf4699f (patch)
tree1d7dc40888d00b25724c1b82e63ea26521737fab /drm/common/DrmInfoStatus.cpp
parent6fb9316f6bd72b406bbfc61bd210281744eea9c1 (diff)
parentef8a810b3b11d177a64111125eaa44bb76624414 (diff)
am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414': Update of DRM framework
Diffstat (limited to 'drm/common/DrmInfoStatus.cpp')
-rw-r--r--drm/common/DrmInfoStatus.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/common/DrmInfoStatus.cpp b/drm/common/DrmInfoStatus.cpp
index f3a1516168a2..8ec7311f7ea1 100644
--- a/drm/common/DrmInfoStatus.cpp
+++ b/drm/common/DrmInfoStatus.cpp
@@ -19,8 +19,9 @@
using namespace android;
DrmInfoStatus::DrmInfoStatus(
- int _statusCode, const DrmBuffer* _drmBuffer, const String8& _mimeType) :
+ int _statusCode, int _infoType, const DrmBuffer* _drmBuffer, const String8& _mimeType) :
statusCode(_statusCode),
+ infoType(_infoType),
drmBuffer(_drmBuffer),
mimeType(_mimeType) {