commit eff45d06902c2a9dc523848a652d2456dfa19d7a
author Thierry Strudel <tstrudel@google.com> Wed Mar 23 18:26:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 23 18:26:35 2016 +0000
tree 437daa2f2f5a3613407b49689dd10c0b2779e713
parent 9b02ecfe308302eae98d50fa165b1faae695f3df
parent 159a8323064d8550218bf31465e51cc5a5d14926

Merge "dumpsys: fix error condition" into nyc-dev

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index db06e99..7e5bbc5 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -138,13 +138,12 @@
     }
 
     if ((skipServices && skippedServices.empty()) ||
-            (!skipServices && !showListOnly && services.empty()) ||
             (showListOnly && (!services.empty() || !skippedServices.empty()))) {
         usage();
         return -1;
     }
 
-    if (!skippedServices.empty() || showListOnly) {
+    if (services.empty() || showListOnly) {
         // gets all services
         services = sm->listServices();
         services.sort(sort_func);