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

* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.

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