diff options
| author | 2019-09-26 15:53:32 -0700 | |
|---|---|---|
| committer | 2019-09-26 15:53:32 -0700 | |
| commit | 6a46c5315ac882e742f9637a091d0503127934a8 (patch) | |
| tree | c4614fbdfb42aa8d7182caa6d5c0837f5b360ea5 /libs/androidfw/AssetManager.cpp | |
| parent | 023ae569914f25473cb3d66f6bb7a287c75d45f9 (diff) | |
| parent | dee02a0fae972bc8c96be96ec2e99d5e5c2b3c15 (diff) | |
Merge changes from topic "system_ext" am: a828ee6442
am: dee02a0fae
Change-Id: If2cc7cfe20182578b4e3c515f42209d9446f6a68
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 4755cb866310..f7c83371f79c 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -74,7 +74,7 @@ const char* AssetManager::RESOURCES_FILENAME = "resources.arsc"; const char* AssetManager::IDMAP_BIN = "/system/bin/idmap"; const char* AssetManager::VENDOR_OVERLAY_DIR = "/vendor/overlay"; const char* AssetManager::PRODUCT_OVERLAY_DIR = "/product/overlay"; -const char* AssetManager::PRODUCT_SERVICES_OVERLAY_DIR = "/product_services/overlay"; +const char* AssetManager::SYSTEM_EXT_OVERLAY_DIR = "/system_ext/overlay"; const char* AssetManager::ODM_OVERLAY_DIR = "/odm/overlay"; const char* AssetManager::OEM_OVERLAY_DIR = "/oem/overlay"; const char* AssetManager::OVERLAY_THEME_DIR_PROPERTY = "ro.boot.vendor.overlay.theme"; @@ -575,7 +575,7 @@ bool AssetManager::appendPathToResTable(asset_path& ap, bool appAsLib) const { mZipSet.setZipResourceTableAsset(ap.path, ass); } } - + if (nextEntryIdx == 0 && ass != NULL) { // If this is the first resource table in the asset // manager, then we are going to cache it so that we |