commit 91a86774805069c853edbb2adb5033ca43621497
author Vishnu Nair <vishnun@google.com> Fri Oct 06 21:31:25 2017 +0000
committer Vishnu Nair <vishnun@google.com> Fri Oct 06 21:31:25 2017 +0000
tree 554beeccbb0642960fcc5ee22d3ae48d66edfb00
parent deb36f24f43fdbd83c5c61d40b9a32d091ac2a37

Revert "Support priority based dumpsys in surface flinger"

This reverts commit deb36f24f43fdbd83c5c61d40b9a32d091ac2a37.

Reason for revert: fixing git_master/mini_emulator_x86-userdebug break

Change-Id: I4729bcb0f4c6ee1f388b916666a0ddbf8a5da5bd

services/utils/PriorityDumper.cpp

diff --git a/services/utils/PriorityDumper.cpp b/services/utils/PriorityDumper.cpp
index 9851188..555cf03 100644
--- a/services/utils/PriorityDumper.cpp
+++ b/services/utils/PriorityDumper.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "include/serviceutils/PriorityDumper.h"
+#include "include/PriorityDumper.h"
 
 namespace android {
 
@@ -25,35 +25,22 @@
     }
 }
 
-status_t PriorityDumper::dumpAll(int fd, const Vector<String16>& args) {
-    status_t status;
-    status = dumpCritical(fd, args);
-    if (status != OK) return status;
-    status = dumpHigh(fd, args);
-    if (status != OK) return status;
-    status = dumpNormal(fd, args);
-    if (status != OK) return status;
-    return status;
-}
-
-status_t PriorityDumper::priorityDump(int fd, const Vector<String16>& args) {
-    status_t status;
+void priorityDump(PriorityDumper& dumper, int fd, const Vector<String16>& args) {
     if (args.size() >= 2 && args[0] == PRIORITY_ARG) {
         String16 priority = args[1];
         Vector<String16> strippedArgs;
         getStrippedArgs(strippedArgs, args, 2);
         if (priority == PRIORITY_ARG_CRITICAL) {
-            status = dumpCritical(fd, strippedArgs);
+            dumper.dumpCritical(fd, strippedArgs);
         } else if (priority == PRIORITY_ARG_HIGH) {
-            status = dumpHigh(fd, strippedArgs);
+            dumper.dumpHigh(fd, strippedArgs);
         } else if (priority == PRIORITY_ARG_NORMAL) {
-            status = dumpNormal(fd, strippedArgs);
+            dumper.dumpNormal(fd, strippedArgs);
         } else {
-            status = dumpAll(fd, args);
+            dumper.dump(fd, args);
         }
     } else {
-        status = dumpAll(fd, args);
+        dumper.dump(fd, args);
     }
-    return status;
 }
-} // namespace android
+} // namespace android
\ No newline at end of file