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

Merge change 26009 into eclair

Browse Source 
* changes:
  Fix issue with printing gles version in aapt dump badging option If the name attribute for uses-feature or uses-permission is empty the error value is still empty indicating error and preventing the else part from being checked as it should be.
This commit is contained in:
Android (Google) Code Review
2009-09-20 17:28:28 -04:00
parent c0df3a473f 40b94725dc
commit f1871e273e
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;
}