commit 30113131fb958850ef92c6a8f7f2aa2ed92a8ffe
author Mårten Kongstad <marten.kongstad@sonymobile.com> Fri Nov 07 10:52:17 2014 +0100
committer Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Fri Nov 07 16:07:42 2014 +0100
tree d6d1d9b3c5bbc4e67caaf67e7c967ebd0a4cbe0f
parent 840796a3c29183a6f9bcf3d50ecae45405b63d88

RRO: reintroduce lost ResTable insert of assets

With the recent introduction of AssetManager::appendPathToResTable,
overlay packages were not properly added to the AssetManager, and once
added, were not properly inserted into the ResTable.

Bug: 17765434
Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e

core/jni/android_util_AssetManager.cpp

diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 4859ee6..0dd35ea 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -2001,7 +2001,7 @@
         (void*) android_content_AssetManager_getAssetRemainingLength },
     { "addAssetPathNative", "(Ljava/lang/String;)I",
         (void*) android_content_AssetManager_addAssetPath },
-    { "addOverlayPath",   "(Ljava/lang/String;)I",
+    { "addOverlayPathNative",   "(Ljava/lang/String;)I",
         (void*) android_content_AssetManager_addOverlayPath },
     { "isUpToDate",     "()Z",
         (void*) android_content_AssetManager_isUpToDate },