diff options
| author | Mårten Kongstad <marten.kongstad@sonymobile.com> | 2015-03-18 15:24:18 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-07 05:40:39 -0800 |
| commit | 4099495ec89a54e7fbaf2ac11d3697478540cd03 (patch) | |
| tree | 7c000e9dc87909a4c8e1e70cd7f6d2720e22c566 | |
| parent | f6f4c01bb9a68028ffe452c9c1a611d45098f1ed (diff) | |
| download | frameworks_base-4099495ec89a54e7fbaf2ac11d3697478540cd03.zip frameworks_base-4099495ec89a54e7fbaf2ac11d3697478540cd03.tar.gz frameworks_base-4099495ec89a54e7fbaf2ac11d3697478540cd03.tar.bz2 | |
RRO: idmap: fix sorting of overlays.list
Multiple overlay packages with targetPackage="android" are loaded in the
wrong order due to the incorrect order they are listed in overlays.list.
This will cause runtime resource overlay to fail when multiple overlay
packages target the same resources in framework-res.apk.
Correct the order in which overlays are loaded by changing the sorting
of overlays.list.
Background: commit f90f2f8d changed the order in which overlay packages
should be added to ResTables. The expected order is now in ascending
priority. This must be reflected in overlays.list.
Change-Id: I249984c0e34b6009e7280ce2777750c76ab16e37
| -rw-r--r-- | cmds/idmap/scan.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp index 29b9cc3..b319e68 100644 --- a/cmds/idmap/scan.cpp +++ b/cmds/idmap/scan.cpp @@ -25,8 +25,7 @@ namespace { bool operator<(Overlay const& rhs) const { - // Note: order is reversed by design - return rhs.priority < priority; + return rhs.priority > priority; } String8 apk_path; |