diff options
Diffstat (limited to 'include/androidfw/AssetManager.h')
| -rw-r--r-- | include/androidfw/AssetManager.h | 98 |
1 files changed, 15 insertions, 83 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index 0b2280239260..3b5cdcefd631 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -59,10 +59,7 @@ struct ResTable_config; * single instance may be shared across multiple threads, and a single * thread may have more than one instance (the latter is discouraged). * - * The purpose of the AssetManager is to create Asset objects. To do - * this efficiently it may cache information about the locations of - * files it has seen. This can be controlled with the "cacheMode" - * argument. + * The purpose of the AssetManager is to create Asset objects. * * The asset hierarchy may be examined like a filesystem, using * AssetDir objects to peruse a single directory. @@ -73,24 +70,16 @@ public: static const char* IDMAP_BIN; static const char* OVERLAY_DIR; /* - * If OVERLAY_SUBDIR_PROPERTY is set, search for runtime resource overlay - * APKs in OVERLAY_SUBDIR/<value of OVERLAY_SUBDIR_PROPERTY>/ rather than in + * If OVERLAY_SKU_DIR_PROPERTY is set, search for runtime resource overlay + * APKs in OVERLAY_DIR/<value of OVERLAY_SKU_DIR_PROPERTY> rather than in * OVERLAY_DIR. */ - static const char* OVERLAY_SUBDIR; - static const char* OVERLAY_SUBDIR_PROPERTY; + static const char* OVERLAY_SKU_DIR_PROPERTY; static const char* TARGET_PACKAGE_NAME; static const char* TARGET_APK_PATH; static const char* IDMAP_DIR; - typedef enum CacheMode { - CACHE_UNKNOWN = 0, - CACHE_OFF, // don't try to cache file locations - CACHE_DEFER, // construct cache as pieces are needed - //CACHE_SCAN, // scan full(!) asset hierarchy at init() time - } CacheMode; - - AssetManager(CacheMode cacheMode = CACHE_OFF); + AssetManager(); virtual ~AssetManager(void); static int32_t getGlobalCount(); @@ -127,23 +116,16 @@ public: int32_t nextAssetPath(const int32_t cookie) const; /* - * Return an asset path in the manager. 'which' must be between 0 and - * countAssetPaths(). + * Return an asset path in the manager. 'cookie' must be a non-negative value + * previously returned from addAssetPath() or nextAssetPath(). */ String8 getAssetPath(const int32_t cookie) const; /* - * Set the current locale and vendor. The locale can change during - * the lifetime of an AssetManager if the user updates the device's - * language setting. The vendor is less likely to change. - * - * Pass in NULL to indicate no preference. - */ - void setLocale(const char* locale); - void setVendor(const char* vendor); - - /* - * Choose screen orientation for resources values returned. + * Sets various device configuration parameters, like screen orientation, layout, + * size, locale, etc. + * The optional 'locale' string takes precedence over the locale within 'config' + * and must be in bcp47 format. */ void setConfiguration(const ResTable_config& config, const char* locale = NULL); @@ -154,9 +136,6 @@ public: /* * Open an asset. * - * This will search through locale-specific and vendor-specific - * directories and packages to find the file. - * * The object returned does not depend on the AssetManager. It should * be freed by calling Asset::close(). */ @@ -166,9 +145,8 @@ public: * Open a non-asset file as an asset. * * This is for opening files that are included in an asset package - * but aren't assets. These sit outside the usual "locale/vendor" - * path hierarchy, and will not be seen by "AssetDir" or included - * in our filename cache. + * but aren't assets. These sit outside the usual "assets/" + * path hierarchy, and will not be seen by "AssetDir". */ Asset* openNonAsset(const char* fileName, AccessMode mode, int32_t* outCookie = NULL); @@ -181,11 +159,6 @@ public: /* * Open a directory within the asset hierarchy. * - * The contents of the directory are an amalgam of vendor-specific, - * locale-specific, and generic assets stored loosely or in asset - * packages. Depending on the cache setting and previous accesses, - * this call may incur significant disk overhead. - * * To open the top-level directory, pass in "". */ AssetDir* openDir(const char* dirName); @@ -193,11 +166,6 @@ public: /* * Open a directory within a particular path of the asset manager. * - * The contents of the directory are an amalgam of vendor-specific, - * locale-specific, and generic assets stored loosely or in asset - * packages. Depending on the cache setting and previous accesses, - * this call may incur significant disk overhead. - * * To open the top-level directory, pass in "". */ AssetDir* openNonAssetDir(const int32_t cookie, const char* dirName); @@ -216,13 +184,6 @@ public: const ResTable& getResources(bool required = true) const; /* - * Discard cached filename information. This only needs to be called - * if somebody has updated the set of "loose" files, and we want to - * discard our cached notion of what's where. - */ - void purge(void) { purgeFileNameCacheLocked(); } - - /* * Return true if the files this AssetManager references are all * up-to-date (have not been changed since it was created). If false * is returned, you will need to create a new AssetManager to get @@ -254,14 +215,8 @@ private: bool isSystemAsset; }; - Asset* openInPathLocked(const char* fileName, AccessMode mode, - const asset_path& path); Asset* openNonAssetInPathLocked(const char* fileName, AccessMode mode, const asset_path& path); - Asset* openInLocaleVendorLocked(const char* fileName, AccessMode mode, - const asset_path& path, const char* locale, const char* vendor); - String8 createPathNameLocked(const asset_path& path, const char* locale, - const char* vendor); String8 createPathNameLocked(const asset_path& path, const char* rootDir); String8 createZipSourceNameLocked(const String8& zipFileName, const String8& dirName, const String8& fileName); @@ -279,15 +234,6 @@ private: void mergeInfoLocked(SortedVector<AssetDir::FileInfo>* pMergedInfo, const SortedVector<AssetDir::FileInfo>* pContents); - void loadFileNameCacheLocked(void); - void fncScanLocked(SortedVector<AssetDir::FileInfo>* pMergedInfo, - const char* dirName); - bool fncScanAndMergeDirLocked( - SortedVector<AssetDir::FileInfo>* pMergedInfo, - const asset_path& path, const char* locale, const char* vendor, - const char* dirName); - void purgeFileNameCacheLocked(void); - const ResTable* getResTable(bool required = true) const; void setLocaleLocked(const char* locale); void updateResourceParamsLocked() const; @@ -344,8 +290,8 @@ private: */ class ZipSet { public: - ZipSet(void); - ~ZipSet(void); + ZipSet() = default; + ~ZipSet(); /* * Return a ZipFileRO structure for a ZipFileRO with the specified @@ -382,23 +328,9 @@ private: Vector<asset_path> mAssetPaths; char* mLocale; - char* mVendor; mutable ResTable* mResources; ResTable_config* mConfig; - - /* - * Cached data for "loose" files. This lets us avoid poking at the - * filesystem when searching for loose assets. Each entry is the - * "extended partial" path, e.g. "default/default/foo/bar.txt". The - * full set of files is present, including ".EXCLUDE" entries. - * - * We do not cache directory names. We don't retain the ".gz", - * because to our clients "foo" and "foo.gz" both look like "foo". - */ - CacheMode mCacheMode; // is the cache enabled? - bool mCacheValid; // clear when locale or vendor changes - SortedVector<AssetDir::FileInfo> mCache; }; }; // namespace android |