Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1871e27 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26009 into eclair 

* 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.
parents c0df3a47 40b94725

tools/aapt/Command.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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;

                            }