summaryrefslogtreecommitdiffstats
path: root/drm/common/DrmEngineBase.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-11-22 21:29:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-22 21:29:08 -0800
commit35f2d3997efe62ce7660ac558578ac5ca834f357 (patch)
tree9f6031e2e4bb9665e619bc881839477c14898a21 /drm/common/DrmEngineBase.cpp
parentc0ec802e96788c3002b737b02707875049758f98 (diff)
parent24a90c2674270fee0783bafa54fd5d845bdf0c18 (diff)
downloadframeworks_base-35f2d3997efe62ce7660ac558578ac5ca834f357.zip
frameworks_base-35f2d3997efe62ce7660ac558578ac5ca834f357.tar.gz
frameworks_base-35f2d3997efe62ce7660ac558578ac5ca834f357.tar.bz2
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
Diffstat (limited to 'drm/common/DrmEngineBase.cpp')
-rw-r--r--drm/common/DrmEngineBase.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/drm/common/DrmEngineBase.cpp b/drm/common/DrmEngineBase.cpp
index 98a9ece..9b16c36 100644
--- a/drm/common/DrmEngineBase.cpp
+++ b/drm/common/DrmEngineBase.cpp
@@ -31,6 +31,10 @@ DrmConstraints* DrmEngineBase::getConstraints(
return onGetConstraints(uniqueId, path, action);
}
+DrmMetadata* DrmEngineBase::getMetadata(int uniqueId, const String8* path) {
+ return onGetMetadata(uniqueId, path);
+}
+
status_t DrmEngineBase::initialize(int uniqueId) {
return onInitialize(uniqueId);
}