diff options
| author | Kenny Root <kroot@google.com> | 2010-09-24 15:22:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 15:22:38 -0700 |
| commit | dcdab6aef1a4e24234982698908a24a9925ce9ab (patch) | |
| tree | c660ca1552cbff42aaa76b329111875b75ea0706 /include/utils | |
| parent | 0b783bc2e4ea2454fda4107d559eefee36b19623 (diff) | |
| parent | 3e07c0007b10fbda945516acaf6b2a8787a6ca06 (diff) | |
| download | frameworks_base-dcdab6aef1a4e24234982698908a24a9925ce9ab.zip frameworks_base-dcdab6aef1a4e24234982698908a24a9925ce9ab.tar.gz frameworks_base-dcdab6aef1a4e24234982698908a24a9925ce9ab.tar.bz2 | |
am 3e07c000: am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread
Merge commit '3e07c0007b10fbda945516acaf6b2a8787a6ca06'
* commit '3e07c0007b10fbda945516acaf6b2a8787a6ca06':
Add locking around ZIP seeking
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/ZipFileRO.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/utils/ZipFileRO.h b/include/utils/ZipFileRO.h index 97d31f4..9668bde 100644 --- a/include/utils/ZipFileRO.h +++ b/include/utils/ZipFileRO.h @@ -24,8 +24,9 @@ #ifndef __LIBS_ZIPFILERO_H #define __LIBS_ZIPFILERO_H -#include "Errors.h" -#include "FileMap.h" +#include <utils/Errors.h> +#include <utils/FileMap.h> +#include <utils/threads.h> #include <stdio.h> #include <stdlib.h> @@ -211,6 +212,9 @@ private: /* open Zip archive */ int mFd; + /* Lock for handling the file descriptor (seeks, etc) */ + mutable Mutex mFdLock; + /* zip file name */ char* mFileName; |