diff options
| author | Robert Greenwalt <> | 2009-04-03 16:44:30 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-03 16:44:30 -0700 |
| commit | 9411a39866b749ad0a47f15083f311847eb79178 (patch) | |
| tree | 9b07caf5f0f48bb19c9e9bf5d185e82a3304a781 /tools | |
| parent | 80e12129773644bd4573207d92119beb9f612c82 (diff) | |
| download | frameworks_base-9411a39866b749ad0a47f15083f311847eb79178.zip frameworks_base-9411a39866b749ad0a47f15083f311847eb79178.tar.gz frameworks_base-9411a39866b749ad0a47f15083f311847eb79178.tar.bz2 | |
AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=1754390
Automated import of CL 144547
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6e522a2..a09b1a6 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1449,8 +1449,11 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, if ((result = e->makeItABag(sourcePos)) != NO_ERROR) { return result; } - - return e->emptyBag(sourcePos); + + if (replace) { + return e->emptyBag(sourcePos); + } + return result; } status_t ResourceTable::addBag(const SourcePos& sourcePos, |