diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 15 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a1a7a3231b82..7ff73a121013 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -50,6 +50,9 @@ import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION; import static android.net.NetworkPolicyManager.isProcStateAllowedWhileIdleOrPowerSaveMode; import static android.net.NetworkPolicyManager.isProcStateAllowedWhileOnRestrictBackground; import static android.os.Build.VERSION_CODES.N; +import static android.os.IServiceManager.DUMP_PRIORITY_CRITICAL; +import static android.os.IServiceManager.DUMP_PRIORITY_HIGH; +import static android.os.IServiceManager.DUMP_PRIORITY_NORMAL; import static android.os.Process.BLUETOOTH_UID; import static android.os.Process.FIRST_APPLICATION_UID; import static android.os.Process.FIRST_ISOLATED_UID; @@ -731,9 +734,6 @@ public class ActivityManagerService extends IActivityManager.Stub doDump(fd, pw, new String[] {"associations"}); } doDump(fd, pw, new String[] {"processes"}); - doDump(fd, pw, new String[] {"-v", "all"}); - doDump(fd, pw, new String[] {"service", "all"}); - doDump(fd, pw, new String[] {"provider", "all"}); } @Override @@ -2498,13 +2498,16 @@ public class ActivityManagerService extends IActivityManager.Stub public void setSystemProcess() { try { - ServiceManager.addService(Context.ACTIVITY_SERVICE, this, true); + ServiceManager.addService(Context.ACTIVITY_SERVICE, this, /* allowIsolated= */ true, + DUMP_PRIORITY_CRITICAL | DUMP_PRIORITY_NORMAL); ServiceManager.addService(ProcessStats.SERVICE_NAME, mProcessStats); - ServiceManager.addService("meminfo", new MemBinder(this)); + ServiceManager.addService("meminfo", new MemBinder(this), /* allowIsolated= */ false, + DUMP_PRIORITY_HIGH | DUMP_PRIORITY_NORMAL); ServiceManager.addService("gfxinfo", new GraphicsBinder(this)); ServiceManager.addService("dbinfo", new DbBinder(this)); if (MONITOR_CPU_USAGE) { - ServiceManager.addService("cpuinfo", new CpuBinder(this)); + ServiceManager.addService("cpuinfo", new CpuBinder(this), + /* allowIsolated= */ false, DUMP_PRIORITY_CRITICAL); } ServiceManager.addService("permission", new PermissionController(this)); ServiceManager.addService("processinfo", new ProcessInfoService(this)); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ff45070e599c..49dd5285691b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -125,6 +125,7 @@ import java.util.Timer; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; +import static android.os.IServiceManager.DUMP_PRIORITY_CRITICAL; import static android.view.Display.DEFAULT_DISPLAY; public final class SystemServer { @@ -824,7 +825,8 @@ public final class SystemServer { wm = WindowManagerService.main(context, inputManager, mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL, !mFirstBoot, mOnlyCore, new PhoneWindowManager()); - ServiceManager.addService(Context.WINDOW_SERVICE, wm); + ServiceManager.addService(Context.WINDOW_SERVICE, wm, /* allowIsolated= */ false, + DUMP_PRIORITY_CRITICAL); ServiceManager.addService(Context.INPUT_SERVICE, inputManager); traceEnd(); |