diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 14:10:36 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-06 14:10:36 -0700 |
commit | 1a16ea88edefc0d80126090f7ad239dbf5231751 (patch) | |
tree | 430cee5364aa7c0e970184d5d7a14462c196cb3e /include | |
parent | 893ad7ed50c3eb1d0120c901dba516fc79e51deb (diff) | |
parent | 71de29ce124d00a8b3f3b3556820532778d96903 (diff) | |
download | frameworks_native-1a16ea88edefc0d80126090f7ad239dbf5231751.zip frameworks_native-1a16ea88edefc0d80126090f7ad239dbf5231751.tar.gz frameworks_native-1a16ea88edefc0d80126090f7ad239dbf5231751.tar.bz2 |
am 991eec03: Merge change 6252 into donut
Merge commit '991eec03a73f8803d0f8c80b418480ea25293cfb'
* commit '991eec03a73f8803d0f8c80b418480ea25293cfb':
Don't re-parse the framework resources all the time.
Diffstat (limited to 'include')
-rw-r--r-- | include/utils/AssetManager.h | 11 | ||||
-rw-r--r-- | include/utils/ResourceTypes.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/utils/AssetManager.h b/include/utils/AssetManager.h index c11429e..d8994e0 100644 --- a/include/utils/AssetManager.h +++ b/include/utils/AssetManager.h @@ -251,6 +251,9 @@ private: Asset* getResourceTableAsset(); Asset* setResourceTableAsset(Asset* asset); + ResTable* getResourceTable(); + ResTable* setResourceTable(ResTable* res); + bool isUpToDate(); protected: @@ -265,6 +268,7 @@ private: time_t mModWhen; Asset* mResourceTableAsset; + ResTable* mResourceTable; static Mutex gLock; static DefaultKeyedVector<String8, wp<SharedZip> > gOpen; @@ -288,8 +292,11 @@ private: */ ZipFileRO* getZip(const String8& path); - Asset* getZipResourceTable(const String8& path); - Asset* setZipResourceTable(const String8& path, Asset* asset); + Asset* getZipResourceTableAsset(const String8& path); + Asset* setZipResourceTableAsset(const String8& path, Asset* asset); + + ResTable* getZipResourceTable(const String8& path); + ResTable* setZipResourceTable(const String8& path, ResTable* res); // generate path, e.g. "common/en-US-noogle.zip" static String8 getPathName(const char* path); diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index eb4151a..93bca4a 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1580,6 +1580,7 @@ public: bool copyData=false); status_t add(Asset* asset, void* cookie, bool copyData=false); + status_t add(ResTable* src); status_t getError() const; |