diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-09 16:25:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-09 16:25:41 +0000 |
| commit | 8085477fb98eab36bbc8c3e9add76f398235b469 (patch) | |
| tree | 7532e6b7fea0f28ee56e2f0e3b85b312c01beafc | |
| parent | 2ffa4aabd76353a907ee89a3e0c6f1961237f257 (diff) | |
| parent | a8995adc2b363811482c38009f64992b322efaad (diff) | |
| download | base-8085477fb98eab36bbc8c3e9add76f398235b469.tar.gz | |
Merge "Don't check for null references."
| -rw-r--r-- | tools/aapt/Command.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 4dc9bfc31c8f..f8633112c018 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -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()); |