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

am f8631178: resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp

Browse Source 
* commit 'f8631178ea8d1dab768873b82d6ace96d01f23a7':
  Don't check for null references.
This commit is contained in:
Dan Albert
2014-09-09 16:59:42 +00:00
committed by Android Git Automerger
parent d6accbcaff 6800165351
commit 729b49e12f
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/aapt/Command.cpp
View File

@@ -212,14 +212,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);
@@ -617,10 +613,7 @@ 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");
return 1;
} else if (res.getError() != NO_ERROR) {
if (res.getError() != NO_ERROR) {
fprintf(stderr, "ERROR: dump failed because the resource table is invalid/corrupt.\n");
return 1;
}