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

Commit 4527a924 authored by Dan Morrill's avatar Dan Morrill Committed by Android (Google) Code Review
Browse files

Merge "Adding a line for android-debuggable to 'dump badging' if... 

Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."
parents 9944ecd2 b6ec11ef

tools/aapt/Command.cpp

+10 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ enum { 
    LABEL_ATTR = 0x01010001,

    ICON_ATTR = 0x01010002,

    NAME_ATTR = 0x01010003,

    DEBUGGABLE_ATTR = 0x0101000f,

    VERSION_CODE_ATTR = 0x0101021b,

    VERSION_NAME_ATTR = 0x0101021c,

    SCREEN_ORIENTATION_ATTR = 0x0101001e,
@@ -830,6 +831,15 @@ int doDump(Bundle* bundle) 
                        if (testOnly != 0) {

                            printf("testOnly='%d'\n", testOnly);

                        }



                        int32_t debuggable = getResolvedIntegerAttribute(&res, tree, DEBUGGABLE_ATTR, &error, 0);

                        if (error != "") {

                            fprintf(stderr, "ERROR getting 'android:debuggable' attribute: %s\n", error.string());

                            goto bail;

                        }

                        if (debuggable != 0) {

                            printf("application-debuggable\n");

                        }

                    } else if (tag == "uses-sdk") {

                        int32_t code = getIntegerAttribute(tree, MIN_SDK_VERSION_ATTR, &error);

                        if (error != "") {