summaryrefslogtreecommitdiffstats
path: root/drm/common
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-03-15 13:51:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 13:51:17 -0700
commit99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 (patch)
treee9354fa75ca308c682ed41c30a258866c4466ee4 /drm/common
parentf1e10e8ed74cac805d601139882378a1f450fe94 (diff)
parente24faedc6bc34d2ef7bc7bae64b6b20ccaf8b97d (diff)
downloadframeworks_av-99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65.zip
frameworks_av-99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65.tar.gz
frameworks_av-99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65.tar.bz2
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d': Bug 4016329 do full string comparisons
Diffstat (limited to 'drm/common')
-rw-r--r--drm/common/DrmSupportInfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/common/DrmSupportInfo.cpp b/drm/common/DrmSupportInfo.cpp
index 3e02093..c0bff0e 100644
--- a/drm/common/DrmSupportInfo.cpp
+++ b/drm/common/DrmSupportInfo.cpp
@@ -45,7 +45,7 @@ bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const {
for (unsigned int i = 0; i < mMimeTypeVector.size(); i++) {
const String8 item = mMimeTypeVector.itemAt(i);
- if (String8("") != mimeType && item.find(mimeType) != -1) {
+ if (!strcasecmp(item.string(), mimeType.string())) {
return true;
}
}
@@ -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 (item.find(fileType) != -1) {
+ if (!strcasecmp(item.string(), fileType.string())) {
return true;
}
}