From: Suchi Amalapurapu <asuchitra@google.com>
Date: Sun, 20 Sep 2009 21:35:24 +0000 (-0700)
Subject: am f1871e27: Merge change 26009 into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/645656765a3d08b236d81b368ceaee2035d1906f?ds=inline;hp=-c

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
---

645656765a3d08b236d81b368ceaee2035d1906f
diff --combined Command.cpp
index db4ac97,4742341..3019bd0
--- a/Command.cpp
+++ b/Command.cpp
@@@ -401,7 -401,7 +401,7 @@@ int doDump(Bundle* bundle
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -427,7 -427,7 +427,7 @@@
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -712,7 -712,8 +712,8 @@@
                                  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 +730,7 @@@
                          }
                      } else if (tag == "uses-permission") {
                          String8 name = getAttribute(tree, NAME_ATTR, &error);
-                         if (error == "") {
+                         if (name != "" && error == "") {
                              if (name == "android.permission.CAMERA") {
                                  hasCameraPermission = true;
                              }