From 29d2f8ee1fd27e07a4f8bb493d3e2d4e784cff53 Mon Sep 17 00:00:00 2001 From: MonoIith Date: Fri, 27 Nov 2015 22:53:46 -0500 Subject: [PATCH] Reintroduce lost ResTable insert of assets [1/3] Properly add overlay packages into the AssetManager, and insert them into the ResTable. Ie21f227c654c98730f74a687d0e16ee2b80e747e --- core/java/android/content/res/AssetManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 4ec0919a0fe..be728dc717c 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -632,14 +632,12 @@ public final int addAssetPath(String path) { public final int addOverlayPath(String idmapPath) { synchronized (this) { int res = addOverlayPathNative(idmapPath); - if (mStringBlocks != null) { - makeStringBlocks(mStringBlocks); - } + makeStringBlocks(mStringBlocks); return res; } } - private native final int addOverlayPathNative(String idmapPath); + public native final int addOverlayPathNative(String idmapPath); /** * Add multiple sets of assets to the asset manager at once. See