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

am 8085477f: Merge "Don\'t check for null references."

Browse Source 
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
This commit is contained in:
Dan Albert
2014-09-09 16:35:02 +00:00
committed by Android Git Automerger
parent 6c585756b4 8085477fb9
commit 1d99636fcc
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/aapt/Command.cpp
View File

@@ -197,14 +197,10 @@ int doList(Bundle* bundle)
}
const ResTable& res = assets.getResources(false);
if (&res == NULL) {
printf("\nNo resource table found.\n");
} else {
#ifndef HAVE_ANDROID_OS
printf("\nResource table:\n");
res.print(false);
printf("\nResource table:\n");
res.print(false);
#endif
}
Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
Asset::ACCESS_BUFFER);
@@ -531,11 +527,6 @@ int doDump(Bundle* bundle)
assets.setConfiguration(config);
const ResTable& res = assets.getResources(false);
if (&res == NULL) {
fprintf(stderr, "ERROR: dump failed because no resource table was found\n");
goto bail;
}
if (strcmp("resources", option) == 0) {
#ifndef HAVE_ANDROID_OS
res.print(bundle->getValues());