diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-02 23:07:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 23:07:43 +0000 |
| commit | 9438ad1599716176fb6c593e77a2e93b265bbcb5 (patch) | |
| tree | b8d7eef8c9baf5837a896a0e2ccbdd7f1d930a29 /core | |
| parent | 723bce8a0d4fa900ca4344c03e5e82b5881fcf19 (diff) | |
| parent | e580d6617f67a1db5eff7ffe5450684cfc7e1a2b (diff) | |
| download | frameworks_base-9438ad1599716176fb6c593e77a2e93b265bbcb5.zip frameworks_base-9438ad1599716176fb6c593e77a2e93b265bbcb5.tar.gz frameworks_base-9438ad1599716176fb6c593e77a2e93b265bbcb5.tar.bz2 | |
am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 16 | ||||
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index ecae52c..a176593 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -627,7 +627,21 @@ public final class AssetManager implements AutoCloseable { * * {@hide} */ - public native final int addOverlayPath(String idmapPath); + + public final int addOverlayPath(String idmapPath) { + synchronized (this) { + int res = addOverlayPathNative(idmapPath); + makeStringBlocks(mStringBlocks); + return res; + } + } + + /** + * See addOverlayPath. + * + * {@hide} + */ + public native final int addOverlayPathNative(String idmapPath); /** * Add multiple sets of assets to the asset manager at once. See diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 459cbd1..daf5a61 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -2057,7 +2057,7 @@ static JNINativeMethod gAssetManagerMethods[] = { (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 }, |