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

Merge "aapt: add support for optional uses-permission" into jb-mr2-dev

Browse Source
This commit is contained in:
Nick Kralevich
2013-04-05 00:22:58 +00:00
committed by Android (Google) Code Review
parent a151ef8c66 1bcc3d691f
commit 745a42bbb9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt/Command.cpp
View File

@@ -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());