am 745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev (ecc5b436) · Commits · e / os / android_frameworks_base

tools/aapt/Command.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -592,6 +592,10 @@ int doDump(Bundle* bundle)
		goto bail;
		}
		printf("uses-permission: %s\n", name.string());
		int req = getIntegerAttribute(tree, REQUIRED_ATTR, NULL, 1);
		if (!req) {
		printf("optional-permission: %s\n", name.string());
		}
		}
		}
		} else if (strcmp("badging", option) == 0) {
		@@ -1033,6 +1037,10 @@ int doDump(Bundle* bundle)
		hasWriteCallLogPermission = true;
		}
		printf("uses-permission:'%s'\n", name.string());
		int req = getIntegerAttribute(tree, REQUIRED_ATTR, NULL, 1);
		if (!req) {
		printf("optional-permission:'%s'\n", name.string());
		}
		} else {
		fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
		error.string());