commit c6e6ea79e1d6b3c430b3eab00da3c44e39db69e8
author Vishnu Nair <vishnun@google.com> Mon Jul 02 14:20:06 2018 -0700
committer Nandana Dutt <nandana@google.com> Tue Oct 02 10:05:58 2018 +0100
tree 298c7dc2ce19d6227fdf13c2e1a7a91521e7fd72
parent 4cd25fc2a5b80ef0f6e6ccff3f390b7495a0e9af

Bugreport: Fix SystemUI service from being dumped twice 2/2

Bug: 110490179
Fix: 110490179

Test: Manual test dumpsys activity
  adb shell dumpsys activity service all-platform-non-critical
  adb shell dumpsys activity service all-platform
  adb shell dumpsys activity service
  Take bugreport and check contents

Test: mmm -j56 frameworks/native/cmds/dumpstate &&  \
  mmm -j56 frameworks/native/cmds/dumpsys &&  adb sync data  &&  \
  adb shell /data/nativetest64/dumpstate_test/dumpstate_test && \
  adb shell /data/nativetest64/dumpsys_test/dumpsys_test && \
  adb shell /data/nativetest64/dumpstate_smoke_test/dumpstate_smoke_test && \
  printf "\n\n#### ALL TESTS PASSED ####\n"

Change-Id: I3736823f72ccb42e0b2603575e827a1647d02ef1
Merged-In: I3736823f72ccb42e0b2603575e827a1647d02ef1
(cherry picked from commit e3694e314e14a696c056ab627c8a3b9066a4e87d)

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 240fb74..cf07a26 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1337,7 +1337,7 @@
     printf("== Running Application Services (platform)\n");
     printf("========================================================\n");
 
-    RunDumpsys("APP SERVICES PLATFORM", {"activity", "service", "all-platform"},
+    RunDumpsys("APP SERVICES PLATFORM", {"activity", "service", "all-platform-non-critical"},
             DUMPSYS_COMPONENTS_OPTIONS);
 
     printf("========================================================\n");