Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b17ba32 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "To support DRM files without file extension"

parents c3369fd7 7f89d09c

drm/common/DrmSupportInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }

drm/drmserver/DrmManager.cpp

+4 −1
Original line number Diff line number Diff line
@@ -184,9 +184,12 @@ bool DrmManager::canHandle(int uniqueId, const String8& path, const String8& mim 
            IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId);

            result = rDrmEngine.canHandle(uniqueId, path);

        } else {

            String8 extension = path.getPathExtension();

            if (String8("") != extension) {

                result = canHandle(uniqueId, path);

            }

        }

    }

    return result;

}