Themes: Port to CM13 [1/3]

Themes: Aapt port

Id: I106d447daf7935bada65e78911d8973ce0ca27ae

Themes: Port our additions to idmap

Id: I2e47cc23de4e7c0b884cccbd87c7d77079ac6824

Themes: remove legacy theme support from idmap

Id: I17dfe35f9985d8cef790b26a8bcda738ea65917c

Themes: Forward port changes to Installer.java

Id: If64e856773e50f5ed74f2358e0c590abad724689

Themes: Add clean spec for aapt

Id: I68f5f63f7e83b99230860dd2d8646e96da484b62

androidfw: Port CM overlay contributions

Id: Id7b7f5f35011922c668fcea3a8aec5b42bd28653

androidfw: Port addOverlayPath and removeOverlayPath

Id: I279db083af28fd8941f3227f2a7512ff094742c1

androidfw: Port addCommonOverlayPath

Id: I12d2fe05a04f6a7e553c330505a475346374b507

androidfw: Port addIconPath

Id: Ide3db28cde0c7f93edd9e7ad626ebace8d4105cc

androidfw: Allow package ID to be overriden at runtime

Id: Ieca3a0ae070a6c0ad0cf2b73b5944d83397d08b9

Aapt: Zip Parsing Test Cases w/ Refactoring

Id: I28f9115700e186136432138d228111ebcfbd0480

Themes: Update tests for idmap

Id: I3dae5bd376d122eab397863378599ae0ac7c6734

androidfw: Add test case for overriding package id

Id: I2668c529e24a55cd6bc8437406fc284b853a75e7

androidfw: Add tests for bags

The overlayOverridesStyleAttribute will currently fail since
our changes to allow theming styles is not currently implemented.

Id: Idfacc4382baf4152c839799a22b6cbe015ef2197

androidfw: Don't consider package ids 0x60 and 0x61 as dynamic

Package IDs that are not 0x01 (system) or 0x7f (app) are treated
as dynamic references.  Overlays are assigned specific package
ids that fall within the region of shared libraries.  This patch
treats them the same as system and app resource packages.

Id: Ieecaa889bed50490796351302405a38f77c84f4e

Theme Parsing & Info

Id: I3583d7e8ca704402e3d8c6e1c7cea1645b91c06f

Port ThemeUtils and its dependencies

This is pretty much copy/paste from cm-11.0

Id: I406860a259136ccca107b981aca0369851df445e

Themes: AndroidManifest and Intent port

Id: Ib97e8539301d20d120fd8b49891fdaae8205fe42

ComposedIconInfo Port (w/ stubbed IconPackHelper)

IconPackHelper is stubbed out so that PMService can reference it,
we'll need to port the Resource stack before porting the implementation.

Id: I59b680511de525e1d375a4f3be04347686b5e81b

Port PackageManagerService and other dependencies

Id: I11629d1e5eee21e01c060bc6c0393aae96034b69

Themes: Add in ThemeService

See also: external/selinux. The policy must be added
in order for the service to start without a security exception.

Change-Id: Ic6f64796b264e430e9706a17a3fd2a35085fd1ca
TODO: ThemeService / Keyguard interaction
TODO: SystemServer - AppsLaunchFailure

Add AppsLaunchFailure

Id: I09a3826f89c62cb898866408e807f269616f48fc

androidfw: Update bags tests

The overlayOverridesStyleAttribute was updated such that it does
not check the attribute of the theme before adding the overlay.
The bag is cached on the first call and the next call, after the
overlay is attached, returns that pre-computed bag so the test would
always fail.  We now simply check that the attribute matches the one
in the overlay, and if so then the test passes.

This patch also adds a new test to check that an overlay can reference
and access resources that are unique to the overlay.  Currently this
test fails.

Id: I3892df3f0d9443a73eaa11b3d5e97cfe86620a73

androidfw: Add test for referencing overlay styles as parents

Id: I4fa3bd447c888e96176955924ebe7ee5c784ab55

androidfw: Allow referencing and retrieving overlay resources

This patch allows a theme to reference it's own resources.  Overlays
get their own group which contains those resources that are not idmapped.
Idmapped resources end up in the target's group.

Id: Ibc119ddcdb35d44a8afec3c6152bcab2909cda18

androidfw: Fill in missing attributes from overlay style

Id: I74051b379b73c728c6a2aa4bc62f3cd268a40b53

Protect windowNoTitle and windowActionBar attributes

This patch creates a new method to define "protected" attributes. These
are attributes like windowActionBar which should not be modified by
a theme.

Some apps (eg gmail) use the appcompat library which
has its own Actionbar classes. When an app uses its own
Actionbar it must not include the default actionbar which is
achieved through the windowActionBar attribute.

Some themes may try to change these attributes, which can will cause
the app to crash.

Id: Ie3bb7285eed09f3f13facf9d142ea9eb83796eec

Themes: Use SYSTEM_DEFAULT in ThemeService

Id: I52794dd98ca2f64aa50046ecdd7f79f27c21dd98

androidfw: Test missing parent attributes are merged in

This test checks that an overlaid style contains any attributes
that were in the original style but omitted in the overlaid style.

Id: I6b496ef2eb0a7ef27b4fafdfda5bdf7ccffad989

androidfw: Add test case for protected attributes

For this test to pass a protected attribute, such as windowNoTitle,
must be equal to the original and not the value specified in the
overlay.

Id: Ic03f11214a1fc4139e3c48d7e72694a80f819023

Themes: Attach theme and icon resources from java

Id: I9ffa0ce96a4af603b78b32d6b190f9698d3e4b4f

Themes: Icons, icons, icons!

Let there be icons.  Legacy icons and composed icons are included
in this patch.

Id: I9fedafa270f1c4dc30c9c8ffd4cf619895e688e6

Themes: Retrieve explicitly themed context and resources

Id: I4e41c251aee47361b183b60089bf5666540f653e

Themes: Add themeChange config change to manifest

Id: Ia84c0089a79637906e4f75fa38a56e8ff3b21a2b

Themes: Register THEME_SERVICE in ContextImpl

Id: I608a0b65c7e2ff0d69bae7bf343916f2b985f4a0

Themes: Remove legacy theme support

Id: I25887843d31f705425aa40f9a23482fd2cafaef8

androidfw: correctly index paths in idmap

Since we added the mtime values for the target and overlay, the
indices are increased by two.

Id: Ie0f5474d425945d58a12021cd2739240d2e98c0a

androidfw: Fix opening assets from theme resources

Id: Iedb51163a62b046cdf7fda1ad1b55cc1ee409047

Themes: Consider overlaid resource as "best fit"

Id: Ife8342a49eb9502be52f085f88161b113332e9e6

Themes: Save and restore theme config

Id: I3fcd445fb458aa6ed09397c05df6eb66d9be7235

Themes: Let ThemeService process additional themes

Id: I45837f26948367d5cc6c520e8c53f9da60bd1fda

AAPT: Don't applyVersionForCompatibility on android

When compiling themes with aapt, we do not want aapt to call
applyVersionForCompatibility as this causes the entries in the
resource table to have an incorrect path.

Id: Ie2c69533b3659c7b7458d6e4b7bdc84946d1be8e

androidfw: Don't consider package id 0x5f as dynamic

Package id 0x5f is reserved for common overlay resources and needs
to be reserved so that it is not considered a dynamic.

Id: Id27b8e0e2231ee8541365274d512e347afcfd05b

AAPT: Include resources.arsc in apk

Common resources needs the resources.arsc in the resources.apk
so that it can be included when processing other overlays.  Without
it, common resources cannot be referenced.

Id: I4aee29f660e4a0aa1909240dc0ca5680f0a2d135

Themes: Add keyguard wallpaper support to theme service

Id: Ib8f8acd55ab4d2b6ef06ee0a630dc50c4f870beb

Themes: Don't pre-process non .9.png images

When creating a resources.apk we do not need to pre-process
the normal .png images as those can be referenced directly from
the theme's apk.

Id: Iaf846a03ead9ecb1e68c040eac6e0ecbfc6e5875

Themes: Adjust offsets for idmap hashes

Idmap now has a header so the indices to the hashes need to be
incremented by one.

Id: If1fb183cc116ef9e3ad6cb4e17b6e44763e9e72a

Themes: Use single ThemeInfo instead of an array

We only ever used the first index so there is no need to use
an array of ThemeInfo(s)

Id: I9e2af076bc17396a0c978be3c0d31c41277db3df

New converter for Kitkat -> L fonts.xml

L introduced a new fonts xml format. Its great, but our themes will
keep using hte old format. This provides a converter and
test cases. The parser was taken from the chooser and remains
mostly unchanged with the exception of a getName() helper method.

Id: Ia1d42c9e50eb7b52d2d98fe6dbeee530bef3adc2

Themes: Port theme bootanimation support to CM12

Id: Ie016884b0e3b77e08732308923ac44e0975e0116

Resources: Clear drawable cache

Id: I04b5b78cce703194a2baeff9c51d2e4733b8ccc9

Font switching

Id: Ia43060a7db624102cdcd9b0d9dc7148441401584

Zygote changes

Id: Ie3681cf0d2b9929661cf1214e899cef9a5f37471

Recreate String Blocks

Id: I4747ebd1a0908b76ae7214b0584948353d426fc5

add a getter for the x and y offsets of the wallpaper window

Id: I35294bcac664e85cc5d344b50b5c4335a60d3f37

Themes: Don't spam logcat with CREATING STRING CACHE

When processing resources with AAPT on the device, it spams the
logcat with warning messages about CREATING STRING CACHE.  Change
ALOGW to ALOGV so it will only show when verbose logging is enabled.

Id: I5b591c3336e176dd71cebe672d60721c29651b00

SystemUI: Audio Volume Panel

Id: I78c471864af401b274597339b8451e65931fdb32

AmService uiContext port

Id: Ida251d7f80797b0ec78b3d20cf60a795d6c4c1f0

Cleanly detach theme assets

Types from an overlay are added to the target group's
TypeList and need to be removed when the overlay assets
are detached.  Failing to remove these types results in
resources not being retieved due to the erroneous types.

Id: I4a9c624e30309e61fce905ced45c55acd3ac4845

Themes: GlobalAction Port

Id: Ifd87e04f94a284e77f1c48bec9fd75d69c45c47e

Themes: Do not store forward locked themes in ASEC containers

If a theme is in a asec container and is applied, when the
device is rebooted the device will get stuck in a nasty boot loop since
the theme resources must be read and the asec container is not ready yet.

Id: I1d93d8175d5c40b34c222974960c43352012a5ad

Use systemui's applied theme for notifications.

Notifications contain RemoteViews which are inflated using the
application's context for which this notification belongs to.  This
can look out of place if SystemUI is using a different theme than the
rest of the system.

This patch will use SystemUIs theme when inflating the RemoteViews,
giving us a more consistent look in the notification drawer.

Id: I9514ce7fcc4858bad3d3c4190f55c1f5a1441d7c

SysUI: Add theme support

This ports over the changes needed to facilitate a theme change in
SystemUI.

Id: I673fb79db90994371a9c0627746a97414132f0ba

Themes: Allow composing of VectorDrawable

Base icons can be vector drawables.  This patch allows them to be
composed.  Currently, VectorDrawables cannot have filters applied
since they do not have a method to get the Paint object like
BitmapDrawable and PaintDrawable.

Id: I762c8e1f4d1c945b8ebc164bbd7944120324bd42

Themes: Add target api to ThemesContract

This will allow the ThemesProvider to track the api a theme was
built for.  We may want to let the user know when a theme may not
be designed for the version of CM installed on their device.

Id: Idf0e6cef0ce9ac5e221ce5ff7e0b155ae0258d5f

Access Themed ResTables from compiled theme apk [1/2]

Before this patch the ResTable for a theme/app was created and
accessed seperate from the compiled APK. Since the compiled APK
has its own copy of the resources.arsc, we can just reuse the table
in the APK instead.

Id: I106a2434e74784bc04014831098f49fe128bc7e2

Themes: Port AppsLaunchFailureReceiver to CM12

Id: I5c3265e64aef1536ba5fceed0ec89082e786b686

Themes: Bump idmap hash version to 3

Due to changes in idmap, we need to force the recreation of resource
cache when upgrading from CM11 to CM12.

Id: I25c1e2c598bca889818e2d685651e3214c30ab3c

Remove debug logs

Id: Ia5cfa83ddf6da195e20526a94ba154864b8d0ecb

Send target sdk version to aapt [1/2]

If vector drawables are used in a theme we must have a minSdkVersion of 21 passed
to aapt or else aapt will Segfault.

Id: I687ee146f9f80543bbcdd06d93891cb3b23001c4

Add missing imports to ActivityThread

Id: I09fe07807ed824ccb938e0e174b06653c613c403

Themes: Dynamically add/remove content from StatusBarWindow

StatusBarWindowView has logic for resizing and fading content
which doesn't always behave correctly if this view is not the
root.  Rather than create a container, this patch uses the
existing StatusBarWindowView as the container and the inflated
status bar is then added to this view.

Id: Ia93d25a589419145f95d75b1b56eb3c2f300f935

Themes: don't use preloaded drawables when themed

If we have themed assets we should try and load those rather than
pulling from the preloaded drawables.  This allows us to continue
and preload drawables in ZygoteInit while maintaining the ability
to theme those preloaded assets.

Id: I68cfc099d328ece0791b6d0e5cf11d07097fd1fd

CM11 -> CM12 Upgrade [1/3]

- Introduce a new secure setting "THEME_PREV_BOOT_API_LEVEL".
  This field will always be set to the previous api level for themes.
  So if we upgrade from CM11 to CM12 this value will differ from the current API
  causing an upgrade to trigger

- When moving from CM11 -> CM12, unapply incompatible overlays

- Rename "holo" to "system" in secure settings themeConfig

- Provide a testing downgrade script to put the secure settings db into a state
  similiar to CM11 (at least for themes)

Id: I71be2c0ad83e60ffe8c574f913e5eaecb9700045

Themes: Add constant for system target API

Id: I0a6caf65c9e8b0feeef1ae848ba4683235304e8c

Change-Id: Ide6d4e1daf535a54efb1ec7cf39ef8b2fb8cf272

6 files changed, 81 insertions, 48 deletions

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index fba462b..b832a35 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -60,6 +60,8 @@
 #define OEM_BOOTANIMATION_FILE "/oem/media/bootanimation.zip"
 #define SYSTEM_BOOTANIMATION_FILE "/system/media/bootanimation.zip"
 #define SYSTEM_ENCRYPTED_BOOTANIMATION_FILE "/system/media/bootanimation-encrypted.zip"
+#define THEME_BOOTANIMATION_FILE "/data/system/theme/bootanimation.zip"
+
 #define EXIT_PROP_NAME "service.bootanim.exit"
 
 namespace android {
@@ -294,11 +296,15 @@ status_t BootAnimation::readyToRun() {
             (access(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE)) != NULL)) ||
 
+            ((access(THEME_BOOTANIMATION_FILE, R_OK) == 0) &&
+            ((zipFile = ZipFileRO::open(THEME_BOOTANIMATION_FILE)) != NULL)) ||
+
             ((access(OEM_BOOTANIMATION_FILE, R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(OEM_BOOTANIMATION_FILE)) != NULL)) ||
 
             ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(SYSTEM_BOOTANIMATION_FILE)) != NULL))) {
+
         mZip = zipFile;
     }
 
diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp
index 929f047..8c07eb0 100644
--- a/cmds/idmap/create.cpp
+++ b/cmds/idmap/create.cpp
@@ -153,26 +153,24 @@ fail:
     }
 
     int create_idmap(const char *target_apk_path, const char *overlay_apk_path,
-            uint32_t **data, size_t *size)
+            uint32_t target_hash, uint32_t overlay_hash, uint32_t **data, size_t *size)
     {
         uint32_t target_crc, overlay_crc;
-        if (get_zip_entry_crc(target_apk_path, AssetManager::RESOURCES_FILENAME,
-				&target_crc) == -1) {
-            return -1;
-        }
-        if (get_zip_entry_crc(overlay_apk_path, AssetManager::RESOURCES_FILENAME,
-				&overlay_crc) == -1) {
-            return -1;
-        }
+
+        // In the original implementation, crc of the res tables are generated
+        // theme apks however do not need a restable, everything is in assets/
+        // instead timestamps are used
+        target_crc = 0;
+        overlay_crc = 0;
 
         AssetManager am;
         bool b = am.createIdmap(target_apk_path, overlay_apk_path, target_crc, overlay_crc,
-                data, size);
+                target_hash, overlay_hash, data, size);
         return b ? 0 : -1;
     }
 
     int create_and_write_idmap(const char *target_apk_path, const char *overlay_apk_path,
-            int fd, bool check_if_stale)
+            uint32_t target_hash, uint32_t overlay_hash, int fd, bool check_if_stale)
     {
         if (check_if_stale) {
             if (!is_idmap_stale_fd(target_apk_path, overlay_apk_path, fd)) {
@@ -184,7 +182,8 @@ fail:
         uint32_t *data = NULL;
         size_t size;
 
-        if (create_idmap(target_apk_path, overlay_apk_path, &data, &size) == -1) {
+        if (create_idmap(target_apk_path, overlay_apk_path, target_hash, overlay_hash,
+                &data, &size) == -1) {
             return -1;
         }
 
@@ -199,6 +198,7 @@ fail:
 }
 
 int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path,
+        uint32_t target_hash, uint32_t overlay_hash,
         const char *idmap_path)
 {
     if (!is_idmap_stale_path(target_apk_path, overlay_apk_path, idmap_path)) {
@@ -211,7 +211,8 @@ int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path,
         return EXIT_FAILURE;
     }
 
-    int r = create_and_write_idmap(target_apk_path, overlay_apk_path, fd, false);
+    int r = create_and_write_idmap(target_apk_path, overlay_apk_path, target_hash, overlay_hash,
+            fd, false);
     close(fd);
     if (r != 0) {
         unlink(idmap_path);
@@ -219,8 +220,11 @@ int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path,
     return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-int idmap_create_fd(const char *target_apk_path, const char *overlay_apk_path, int fd)
+int idmap_create_fd(const char *target_apk_path, const char *overlay_apk_path,
+        uint32_t target_hash, uint32_t overlay_hash,
+        int fd)
 {
-    return create_and_write_idmap(target_apk_path, overlay_apk_path, fd, true) == 0 ?
+    return create_and_write_idmap(target_apk_path, overlay_apk_path, target_hash, overlay_hash,
+            fd, true) == 0 ?
         EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/cmds/idmap/idmap.cpp b/cmds/idmap/idmap.cpp
index 90cfa2c..607cfd3 100644
--- a/cmds/idmap/idmap.cpp
+++ b/cmds/idmap/idmap.cpp
@@ -66,29 +66,31 @@ EXAMPLES \n\
       Display an idmap file: \n\
 \n\
       $ adb shell idmap --inspect /data/resource-cache/vendor@overlay@overlay.apk@idmap \n\
-      SECTION      ENTRY        VALUE      COMMENT \n\
-      IDMAP HEADER magic        0x706d6469 \n\
-                   base crc     0xb65a383f \n\
-                   overlay crc  0x7b9675e8 \n\
-                   base path    .......... /path/to/target.apk \n\
-                   overlay path .......... /path/to/overlay.apk \n\
-      DATA HEADER  target pkg   0x0000007f \n\
-                   types count  0x00000003 \n\
-      DATA BLOCK   target type  0x00000002 \n\
-                   overlay type 0x00000002 \n\
-                   entry count  0x00000001 \n\
-                   entry offset 0x00000000 \n\
-                   entry        0x00000000 drawable/drawable \n\
-      DATA BLOCK   target type  0x00000003 \n\
-                   overlay type 0x00000003 \n\
-                   entry count  0x00000001 \n\
-                   entry offset 0x00000000 \n\
-                   entry        0x00000000 xml/integer \n\
-      DATA BLOCK   target type  0x00000004 \n\
-                   overlay type 0x00000004 \n\
-                   entry count  0x00000001 \n\
-                   entry offset 0x00000000 \n\
-                   entry        0x00000000 raw/lorem_ipsum \n\
+      SECTION      ENTRY         VALUE      COMMENT \n\
+      IDMAP HEADER magic         0x706d6469 \n\
+                   base crc      0xb65a383f \n\
+                   overlay crc   0x7b9675e8 \n\
+                   base mtime    0x1eb47d51 \n\
+                   overlay mtime 0x185f87a2 \n\
+                   base path     .......... /path/to/target.apk \n\
+                   overlay path  .......... /path/to/overlay.apk \n\
+      DATA HEADER  target pkg    0x0000007f \n\
+                   types count   0x00000003 \n\
+      DATA BLOCK   target type   0x00000002 \n\
+                   overlay type  0x00000002 \n\
+                   entry count   0x00000001 \n\
+                   entry offset  0x00000000 \n\
+                   entry         0x00000000 drawable/drawable \n\
+      DATA BLOCK   target type   0x00000003 \n\
+                   overlay type  0x00000003 \n\
+                   entry count   0x00000001 \n\
+                   entry offset  0x00000000 \n\
+                   entry         0x00000000 xml/integer \n\
+      DATA BLOCK   target type   0x00000004 \n\
+                   overlay type  0x00000004 \n\
+                   entry count   0x00000001 \n\
+                   entry offset  0x00000000 \n\
+                   entry         0x00000000 raw/lorem_ipsum \n\
 \n\
       In this example, the overlay package provides three alternative resource values:\n\
       drawable/drawable, xml/integer, and raw/lorem_ipsum \n\
@@ -120,7 +122,7 @@ NOTES \n\
     }
 
     int maybe_create_fd(const char *target_apk_path, const char *overlay_apk_path,
-            const char *idmap_str)
+            const char *idmap_str, const char *target_hash_str, const char *overlay_hash_str)
     {
         // anyone (not just root or system) may do --fd -- the file has
         // already been opened by someone else on our behalf
@@ -141,12 +143,15 @@ NOTES \n\
             ALOGD("error: failed to read apk %s: %s\n", overlay_apk_path, strerror(errno));
             return -1;
         }
+        int target_hash = strtol(target_hash_str, 0, 10);
+        int overlay_hash = strtol(overlay_hash_str, 0, 10);
 
-        return idmap_create_fd(target_apk_path, overlay_apk_path, idmap_fd);
+        return idmap_create_fd(target_apk_path, overlay_apk_path, target_hash, overlay_hash,
+                idmap_fd);
     }
 
     int maybe_create_path(const char *target_apk_path, const char *overlay_apk_path,
-            const char *idmap_path)
+            const char *idmap_path, const char *target_hash_str, const char *overlay_hash_str)
     {
         if (!verify_root_or_system()) {
             fprintf(stderr, "error: permission denied: not user root or user system\n");
@@ -163,7 +168,10 @@ NOTES \n\
             return -1;
         }
 
-        return idmap_create_path(target_apk_path, overlay_apk_path, idmap_path);
+        int target_hash = strtol(target_hash_str, 0, 10);
+        int overlay_hash = strtol(overlay_hash_str, 0, 10);
+        return idmap_create_path(target_apk_path, overlay_apk_path, target_hash, overlay_hash,
+                idmap_path);
     }
 
     int maybe_scan(const char *overlay_dir, const char *target_package_name,
@@ -222,12 +230,12 @@ int main(int argc, char **argv)
         return 0;
     }
 
-    if (argc == 5 && !strcmp(argv[1], "--fd")) {
-        return maybe_create_fd(argv[2], argv[3], argv[4]);
+    if (argc == 7 && !strcmp(argv[1], "--fd")) {
+        return maybe_create_fd(argv[2], argv[3], argv[4], argv[5], argv[6]);
     }
 
-    if (argc == 5 && !strcmp(argv[1], "--path")) {
-        return maybe_create_path(argv[2], argv[3], argv[4]);
+    if (argc == 7 && !strcmp(argv[1], "--path")) {
+        return maybe_create_path(argv[2], argv[3], argv[4], argv[5], argv[6]);
     }
 
     if (argc == 6 && !strcmp(argv[1], "--scan")) {
diff --git a/cmds/idmap/idmap.h b/cmds/idmap/idmap.h
index f507dd8..1794db7 100644
--- a/cmds/idmap/idmap.h
+++ b/cmds/idmap/idmap.h
@@ -19,9 +19,12 @@
 #endif
 
 int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path,
+        uint32_t target_hash, uint32_t overlay_hash,
         const char *idmap_path);
 
-int idmap_create_fd(const char *target_apk_path, const char *overlay_apk_path, int fd);
+int idmap_create_fd(const char *target_apk_path, const char *overlay_apk_path,
+        uint32_t target_hash, uint32_t overlay_hash,
+        int fd);
 
 // Regarding target_package_name: the idmap_scan implementation should
 // be able to extract this from the manifest in target_apk_path,
diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp
index f6afc85..a7844a9 100644
--- a/cmds/idmap/inspect.cpp
+++ b/cmds/idmap/inspect.cpp
@@ -200,6 +200,18 @@ namespace {
         }
         print("", "overlay crc", i, "");
 
+        err = buf.nextUint32(&i);
+		if (err != NO_ERROR) {
+			return err;
+		}
+		print("", "base mtime", i, "");
+
+        err = buf.nextUint32(&i);
+		if (err != NO_ERROR) {
+			return err;
+		}
+		print("", "overlay mtime", i, "");
+
         err = buf.nextPath(path);
         if (err != NO_ERROR) {
             // printe done from IdmapBuffer::nextPath
diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp
index 612a7eb..62ad6a9 100644
--- a/cmds/idmap/scan.cpp
+++ b/cmds/idmap/scan.cpp
@@ -203,7 +203,7 @@ int idmap_scan(const char *overlay_dir, const char *target_package_name,
         idmap_path.appendPath(flatten_path(overlay_apk_path + 1));
         idmap_path.append("@idmap");
 
-        if (idmap_create_path(target_apk_path, overlay_apk_path, idmap_path.string()) != 0) {
+        if (idmap_create_path(target_apk_path, overlay_apk_path, 0, 0, idmap_path.string()) != 0) {
             ALOGE("error: failed to create idmap for target=%s overlay=%s idmap=%s\n",
                     target_apk_path, overlay_apk_path, idmap_path.string());
             continue;