am 24a90c26: am d9334934: Merge "Update of DRM Framework."

* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
  Update of DRM Framework.
This commit is contained in:
Gloria Wang
2010-11-22 21:29:08 -08:00
committed by Android Git Automerger
18 changed files with 433 additions and 2 deletions

View File

@@ -101,6 +101,14 @@ DrmConstraints* DrmManagerClientImpl::getConstraints(
return drmConstraints;
}
DrmMetadata* DrmManagerClientImpl::getMetadata(int uniqueId, const String8* path) {
DrmMetadata *drmMetadata = NULL;
if ((NULL != path) && (EMPTY_STRING != *path)) {
drmMetadata = getDrmManagerService()->getMetadata(uniqueId, path);
}
return drmMetadata;
}
bool DrmManagerClientImpl::canHandle(int uniqueId, const String8& path, const String8& mimeType) {
bool retCode = false;
if ((EMPTY_STRING != path) || (EMPTY_STRING != mimeType)) {