Themes: Restructure resource cache [1/2]

The new structure is as follows:
/data/resource-cache/
        ├─ theme1_pkg_name
        |     ├─ target1_pkg_name
        |     |     ├─ idmap
        |     |     └─ resources.apk
        |     ├─ target2_pkg_name
        |     ·
        |     ·
        |     ·
        |     ├─ targetN_pkg_name
        |     └─ icons
        |           ├─ hash
        |           └─ resources.apk
        ├─ theme2_pkg_name
        ·
        ·
        ·
        └─ themeN_pkg_name

Change-Id: Id39688c88929733b42368c1f20ef0e25848a3390

1 files changed, 7 insertions, 8 deletions

diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index f663c50..421701a 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -644,11 +644,10 @@ public final class AssetManager implements AutoCloseable {
      *
      * {@hide}
      */
-
-     public final int addOverlayPath(String idmapPath, String resApkPath, String targetPkgPath,
-            String prefixPath) {
+     public final int addOverlayPath(String idmapPath, String themeApkPath,
+             String resApkPath, String targetPkgPath, String prefixPath) {
         synchronized (this) {
-            int res = addOverlayPathNative(idmapPath, resApkPath, targetPkgPath,
+            int res = addOverlayPathNative(idmapPath, themeApkPath, resApkPath, targetPkgPath,
                     prefixPath);
             makeStringBlocks(mStringBlocks);
             return res;
@@ -660,7 +659,7 @@ public final class AssetManager implements AutoCloseable {
      *
      * {@hide}
      */
-    private native final int addOverlayPathNative(String idmapPath,
+    private native final int addOverlayPathNative(String idmapPath, String themeApkPath,
             String resApkPath, String targetPkgPath, String prefixPath);
 
     /**
@@ -668,14 +667,14 @@ public final class AssetManager implements AutoCloseable {
      *
      * {@hide}
      */
-    public final int addCommonOverlayPath(String idmapPath,
+    public final int addCommonOverlayPath(String themeApkPath,
             String resApkPath, String prefixPath) {
         synchronized (this) {
-            return addCommonOverlayPathNative(idmapPath, resApkPath, prefixPath);
+            return addCommonOverlayPathNative(themeApkPath, resApkPath, prefixPath);
         }
     }
 
-    private native final int addCommonOverlayPathNative(String idmapPath,
+    private native final int addCommonOverlayPathNative(String themeApkPath,
             String resApkPath, String prefixPath);
 
     /**