diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-09-20 14:35:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-20 14:35:24 -0700 |
| commit | e8e977bc4a5031da623188a562a1276305a7bf21 (patch) | |
| tree | 46c5cd06ba11834511c794c46b6bccc7a5f3502f /tools/aapt | |
| parent | 358d4aa1e4b4282b7637fec24364ab286358c451 (diff) | |
| parent | f1871e273e1bf49d72a7f2ef51a4ef377d8f3112 (diff) | |
| download | frameworks_base-e8e977bc4a5031da623188a562a1276305a7bf21.zip frameworks_base-e8e977bc4a5031da623188a562a1276305a7bf21.tar.gz frameworks_base-e8e977bc4a5031da623188a562a1276305a7bf21.tar.bz2 | |
am f1871e27: Merge change 26009 into eclair
Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp
* commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112':
Fix issue with printing gles version in aapt dump badging option
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Command.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index db4ac97..3019bd0 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -712,7 +712,8 @@ int doDump(Bundle* bundle) LARGE_SCREEN_ATTR, NULL, 1); } else if (tag == "uses-feature") { String8 name = getAttribute(tree, NAME_ATTR, &error); - if (error == "") { + + if (name != "" && error == "") { int req = getIntegerAttribute(tree, REQUIRED_ATTR, NULL, 1); if (name == "android.hardware.camera") { @@ -729,7 +730,7 @@ int doDump(Bundle* bundle) } } else if (tag == "uses-permission") { String8 name = getAttribute(tree, NAME_ATTR, &error); - if (error == "") { + if (name != "" && error == "") { if (name == "android.permission.CAMERA") { hasCameraPermission = true; } |