diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-03 17:49:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 17:49:12 +0000 |
| commit | 503071ae41374a66f61e53e05a91243473db83b9 (patch) | |
| tree | db4b1a0c53a697fb010a6feba69e9b2bb11250fd /include | |
| parent | b940599a750e3ee50934c57b6a22841627be2d2e (diff) | |
| parent | a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b (diff) | |
| download | frameworks_base-503071ae41374a66f61e53e05a91243473db83b9.zip frameworks_base-503071ae41374a66f61e53e05a91243473db83b9.tar.gz frameworks_base-503071ae41374a66f61e53e05a91243473db83b9.tar.bz2 | |
am a2b5067a: Merge "RRO: prevent duplicate system overlays"
* commit 'a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
RRO: prevent duplicate system overlays
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, |