commit 7f89d09c0f4a47119834ba15789260b933123ea5
author Gloria Wang <gwang@google.com> Wed Mar 02 12:33:00 2011 -0800
committer Gloria Wang <gwang@google.com> Wed Mar 02 12:33:00 2011 -0800
tree 69a8676dad50967012b6abe98bdd7e1f859ecce9
parent 5f5354e35ab3b2a0cb4cabb6d0aa5a160225ccc8

To support DRM files without file extension

Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c

drm/common/DrmSupportInfo.cpp

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 @@
     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;
         }
     }

drm/drmserver/DrmManager.cpp

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 @@
             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;