summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework
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/libdrmframework
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/libdrmframework')
-rw-r--r--drm/libdrmframework/include/PlugInManager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/libdrmframework/include/PlugInManager.h b/drm/libdrmframework/include/PlugInManager.h
index 7bb143f..c1d019a 100644
--- a/drm/libdrmframework/include/PlugInManager.h
+++ b/drm/libdrmframework/include/PlugInManager.h
@@ -80,7 +80,7 @@ public:
Vector<String8> plugInFileList = getPlugInPathList(rsPlugInDirPath);
if (!plugInFileList.isEmpty()) {
- for (unsigned int i = 0; i < plugInFileList.size(); ++i) {
+ for (size_t i = 0; i < plugInFileList.size(); ++i) {
loadPlugIn(plugInFileList[i]);
}
}
@@ -91,7 +91,7 @@ public:
*
*/
void unloadPlugIns() {
- for (unsigned int i = 0; i < m_plugInIdList.size(); ++i) {
+ for (size_t i = 0; i < m_plugInIdList.size(); ++i) {
unloadPlugIn(m_plugInIdList[i]);
}
m_plugInIdList.clear();