summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-03-14 10:43:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-14 10:43:22 -0700
commit27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e (patch)
treeee478a3f921519b7a79b194b8142124697c7b474 /drm/libdrmframework
parent75979dc147c4d2f832730da2e9b68d93ce892ba3 (diff)
parentad6ec91c0bca37587e28bf72dfc38cde1b90544f (diff)
downloadframeworks_av-27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e.zip
frameworks_av-27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e.tar.gz
frameworks_av-27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e.tar.bz2
Merge "make sure that lower-case mime and file suffix is used to check against the supported ones"
Diffstat (limited to 'drm/libdrmframework')
-rw-r--r--drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
index 5ee41e6..4b1b40e 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
@@ -159,11 +159,13 @@ android::status_t FwdLockEngine::onTerminate(int uniqueId) {
return DRM_NO_ERROR;
}
+// make sure that lower-case letters are used.
const String8 FwdLockEngine::FileSuffixes[] = {
String8(".fl"),
String8(".dm"),
};
+// make sure that lower-case letters are used.
const String8 FwdLockEngine::MimeTypes[] = {
String8("application/x-android-drm-fl"),
String8("application/vnd.oma.drm.message"),
@@ -184,8 +186,10 @@ void FwdLockEngine::AddSupportedFileSuffixes(DrmSupportInfo *info) {
}
bool FwdLockEngine::IsMimeTypeSupported(const String8& mime) {
+ String8 tmp(mime);
+ tmp.toLower();
for (size_t i = 0, n = sizeof(MimeTypes)/sizeof(MimeTypes[0]); i < n; ++i) {
- if (mime == MimeTypes[i]) {
+ if (tmp == MimeTypes[i]) {
return true;
}
}
@@ -193,8 +197,10 @@ bool FwdLockEngine::IsMimeTypeSupported(const String8& mime) {
}
bool FwdLockEngine::IsFileSuffixSupported(const String8& suffix) {
+ String8 tmp(suffix);
+ tmp.toLower();
for (size_t i = 0, n = sizeof(FileSuffixes)/sizeof(FileSuffixes[0]); i < n; ++i) {
- if (suffix == FileSuffixes[i]) {
+ if (tmp == FileSuffixes[i]) {
return true;
}
}
@@ -220,7 +226,6 @@ bool FwdLockEngine::onCanHandle(int uniqueId, const String8& path) {
bool result = false;
String8 extString = path.getPathExtension();
- extString.toLower();
return IsFileSuffixSupported(extString);
}
@@ -331,8 +336,6 @@ int FwdLockEngine::onGetDrmObjectType(int uniqueId,
LOG_VERBOSE("FwdLockEngine::onGetDrmObjectType");
- mimeStr.toLower();
-
/* Checks whether
* 1. path and mime type both are not empty strings (meaning unavailable) else content is unknown
* 2. if one of them is empty string and if other is known then its a DRM Content Object.