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

Merge "Don't check for null references."

Browse Source
This commit is contained in:
Dan Albert
2014-09-09 16:25:41 +00:00
committed by Gerrit Code Review
parent 2ffa4aabd7 a8995adc2b
commit 8085477fb9
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/Command.cpp
View File

@@ -197,14 +197,10 @@ int doList(Bundle* bundle)
} }
const ResTable& res = assets.getResources(false); const ResTable& res = assets.getResources(false);
if (&res == NULL) {
printf("\nNo resource table found.\n");
} else {
#ifndef HAVE_ANDROID_OS #ifndef HAVE_ANDROID_OS
printf("\nResource table:\n"); printf("\nResource table:\n");
res.print(false); res.print(false);
#endif #endif
}
Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml", Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
Asset::ACCESS_BUFFER); Asset::ACCESS_BUFFER);
@@ -531,11 +527,6 @@ int doDump(Bundle* bundle)
assets.setConfiguration(config); assets.setConfiguration(config);
const ResTable& res = assets.getResources(false); 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) { if (strcmp("resources", option) == 0) {
#ifndef HAVE_ANDROID_OS #ifndef HAVE_ANDROID_OS
res.print(bundle->getValues()); res.print(bundle->getValues());