Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD

1 files changed, 12 insertions, 5 deletions

diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp
index f00f488..eebcb79 100644
--- a/media/libmediaplayerservice/Drm.cpp
+++ b/media/libmediaplayerservice/Drm.cpp
@@ -211,15 +211,22 @@ bool Drm::loadLibraryForScheme(const String8 &path, const uint8_t uuid[16]) {
     return true;
 }
 
-bool Drm::isCryptoSchemeSupported(const uint8_t uuid[16]) {
+bool Drm::isCryptoSchemeSupported(const uint8_t uuid[16], const String8 &mimeType) {
+
     Mutex::Autolock autoLock(mLock);
 
-    if (mFactory && mFactory->isCryptoSchemeSupported(uuid)) {
-        return true;
+    if (!mFactory || !mFactory->isCryptoSchemeSupported(uuid)) {
+        findFactoryForScheme(uuid);
+        if (mInitCheck != OK) {
+            return false;
+        }
+    }
+
+    if (mimeType != "") {
+        return mFactory->isContentTypeSupported(mimeType);
     }
 
-    findFactoryForScheme(uuid);
-    return (mInitCheck == OK);
+    return true;
 }
 
 status_t Drm::createPlugin(const uint8_t uuid[16]) {