commit 6800165351b693fa7e4bcf0f205655f0cd16b361
author Dan Albert <danalbert@google.com> Tue Sep 09 09:51:01 2014 -0700
committer Dan Albert <danalbert@google.com> Tue Sep 09 09:51:01 2014 -0700
tree 4d3911423ebd8e3642a487c7d1bf9da388109440
parent 08dceea7d32475ac1cea85280deee5a87ac7ab86
parent 1d99636fcccbf45a6cc39c478d534da7a5714eec

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

Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 27e60f3..0b11c93 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -212,14 +212,10 @@
         }
 
         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 @@
     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;
     }