diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-09 15:00:30 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-03-09 17:18:05 -0800 |
| commit | cf244ada58539ce857ec041d7288d0271204fbb6 (patch) | |
| tree | ec16084d19a3b0c0e43e11dd276fbe7c6a6813c5 /libs | |
| parent | ae58f6d7473c67d76b6c6373794fd1a77543ddb4 (diff) | |
| download | frameworks_base-cf244ada58539ce857ec041d7288d0271204fbb6.zip frameworks_base-cf244ada58539ce857ec041d7288d0271204fbb6.tar.gz frameworks_base-cf244ada58539ce857ec041d7288d0271204fbb6.tar.bz2 | |
Add ability for some manifest attributes to reference resources.
This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources. This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).
Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index 38d8412..7e0f881 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -625,6 +625,10 @@ void ResXMLParser::restart() mCurNode = NULL; mEventCode = mTree.mError == NO_ERROR ? START_DOCUMENT : BAD_DOCUMENT; } +const ResStringPool& ResXMLParser::getStrings() const +{ + return mTree.mStrings; +} ResXMLParser::event_code_t ResXMLParser::getEventType() const { @@ -1149,11 +1153,6 @@ void ResXMLTree::uninit() restart(); } -const ResStringPool& ResXMLTree::getStrings() const -{ - return mStrings; -} - status_t ResXMLTree::validateNode(const ResXMLTree_node* node) const { const uint16_t eventCode = dtohs(node->header.type); |