diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-02 16:26:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 16:26:18 -0800 |
| commit | 8b17ba3296340dd556d5c00b322be42b9490b4e0 (patch) | |
| tree | 5a868c835aae79c9590af717f354fe7ba6abff5d | |
| parent | c3369fd756f015b06fe5824766e618160fe079f5 (diff) | |
| parent | 7f89d09c0f4a47119834ba15789260b933123ea5 (diff) | |
| download | frameworks_av-8b17ba3296340dd556d5c00b322be42b9490b4e0.zip frameworks_av-8b17ba3296340dd556d5c00b322be42b9490b4e0.tar.gz frameworks_av-8b17ba3296340dd556d5c00b322be42b9490b4e0.tar.bz2 | |
Merge "To support DRM files without file extension"
| -rw-r--r-- | drm/common/DrmSupportInfo.cpp | 2 | ||||
| -rw-r--r-- | drm/drmserver/DrmManager.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drm/common/DrmSupportInfo.cpp b/drm/common/DrmSupportInfo.cpp index ffc8953..3e02093 100644 --- a/drm/common/DrmSupportInfo.cpp +++ b/drm/common/DrmSupportInfo.cpp @@ -56,7 +56,7 @@ bool DrmSupportInfo::isSupportedFileSuffix(const String8& fileType) const { for (unsigned int i = 0; i < mFileSuffixVector.size(); i++) { const String8 item = mFileSuffixVector.itemAt(i); - if (String8("") != fileType && item.find(fileType) != -1) { + if (item.find(fileType) != -1) { return true; } } diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index ef7d274..ec400b7 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -184,7 +184,10 @@ bool DrmManager::canHandle(int uniqueId, const String8& path, const String8& mim IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId); result = rDrmEngine.canHandle(uniqueId, path); } else { - result = canHandle(uniqueId, path); + String8 extension = path.getPathExtension(); + if (String8("") != extension) { + result = canHandle(uniqueId, path); + } } } return result; |