Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f1871e27: Merge change 26009 into eclair

Browse Source 
Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp

* commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112':
  Fix issue with printing gles version in aapt dump badging option
This commit is contained in:
Suchi Amalapurapu
2009-09-20 14:35:24 -07:00
committed by Android Git Automerger
parent 358d4aa1e4 f1871e273e
commit e8e977bc4a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt/Command.cpp
View File

@@ -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;
}