diff options
| author | Mårten Kongstad <marten.kongstad@sonymobile.com> | 2014-11-07 10:57:15 +0100 |
|---|---|---|
| committer | Zoran Jovanovic <zoran.jovanovic@sonymobile.com> | 2014-11-07 16:08:22 +0100 |
| commit | cb7b63d928cd562ea66d10d816056b984f50193a (patch) | |
| tree | 0078c4cd3321ca9d533432f7092da58d2a6fa2f0 /include | |
| parent | 96198ebae8deab14b434645f628213db492abdbc (diff) | |
| download | frameworks_base-cb7b63d928cd562ea66d10d816056b984f50193a.zip frameworks_base-cb7b63d928cd562ea66d10d816056b984f50193a.tar.gz frameworks_base-cb7b63d928cd562ea66d10d816056b984f50193a.tar.bz2 | |
RRO: prevent duplicate system overlays
System overlays, ie overlays with targetPackage="android", were loaded
twice, which caused all sorts of issues. Ensure they are only loaded
once, which will be during Zygote initialization.
Bug: 17765434
Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/AssetManager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index 99b3195..0cfd2b1 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -236,9 +236,11 @@ public: private: struct asset_path { + asset_path() : path(""), type(kFileTypeRegular), idmap(""), isSystemOverlay(false) {} String8 path; FileType type; String8 idmap; + bool isSystemOverlay; }; Asset* openInPathLocked(const char* fileName, AccessMode mode, |