diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-09 16:06:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 16:06:07 -0700 |
| commit | f51ded0f8f593d17af82946eb65c05fc04f688b4 (patch) | |
| tree | 32b39d7d93170aed01c11e7353afc53a2b306cb4 /include | |
| parent | 5a8455c3c625201f3ae6b9ce32913bf97ba61cc8 (diff) | |
| parent | a8d7ea067cf22baeee2ff0a33e5a8c5a35936942 (diff) | |
| download | frameworks_base-f51ded0f8f593d17af82946eb65c05fc04f688b4.zip frameworks_base-f51ded0f8f593d17af82946eb65c05fc04f688b4.tar.gz frameworks_base-f51ded0f8f593d17af82946eb65c05fc04f688b4.tar.bz2 | |
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
Enforce public resource restriction on bag parents.
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/ResourceTypes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 8a92cd6..612ff93 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1988,7 +1988,8 @@ public: String16* outName, const String16* defType = NULL, const String16* defPackage = NULL, - const char** outErrorMsg = NULL); + const char** outErrorMsg = NULL, + bool* outPublicOnly = NULL); static bool stringToInt(const char16_t* s, size_t len, Res_value* outValue); static bool stringToFloat(const char16_t* s, size_t len, Res_value* outValue); |