diff options
| author | 2019-09-26 16:00:00 -0700 | |
|---|---|---|
| committer | 2019-09-26 16:00:00 -0700 | |
| commit | cac57919541a88f807935a854df484710f4a33b2 (patch) | |
| tree | 1914f3bf48613df5df61db93c1a69613a12abd4c /libs/androidfw/AssetManager.cpp | |
| parent | a3dc6e86fc3dac66865e2db9f54a213421ab4ac8 (diff) | |
| parent | 6a46c5315ac882e742f9637a091d0503127934a8 (diff) | |
Merge changes from topic "system_ext" am: a828ee6442 am: dee02a0fae
am: 6a46c5315a
Change-Id: Ic31f9d12fffda486d36ce427848e04c7755cc531
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 |