summaryrefslogtreecommitdiffstats
path: root/drm/common/DrmSupportInfo.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-15 23:37:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-15 23:37:19 +0000
commit1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (patch)
tree220f4583ae1081df62fa5c861eed3e9e90a24515 /drm/common/DrmSupportInfo.cpp
parent4845b69f70ff457be8d8908f6eb61e2af67e00d3 (diff)
parente80631aa1992ca50af679cd6a018c0ffda7f9b17 (diff)
downloadframeworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.zip
frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.gz
frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.bz2
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
Diffstat (limited to 'drm/common/DrmSupportInfo.cpp')
-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 5400bdd..584c6a6 100644
--- a/drm/common/DrmSupportInfo.cpp
+++ b/drm/common/DrmSupportInfo.cpp
@@ -47,7 +47,7 @@ bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const {
return false;
}
- for (unsigned int i = 0; i < mMimeTypeVector.size(); i++) {
+ for (size_t i = 0; i < mMimeTypeVector.size(); i++) {
const String8 item = mMimeTypeVector.itemAt(i);
if (!strcasecmp(item.string(), mimeType.string())) {
@@ -58,7 +58,7 @@ bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const {
}
bool DrmSupportInfo::isSupportedFileSuffix(const String8& fileType) const {
- for (unsigned int i = 0; i < mFileSuffixVector.size(); i++) {
+ for (size_t i = 0; i < mFileSuffixVector.size(); i++) {
const String8 item = mFileSuffixVector.itemAt(i);
if (!strcasecmp(item.string(), fileType.string())) {