Merge "Make system_server profilable on user." into rvc-dev am: 4b500ced32

Change-Id: I57df67e59b6ed1187e0bb0893f6020d9f62f489f
2020-04-07 09:55:41 +00:00
parent dcb31d4b7e 4b500ced32
commit 037c545335
1 changed files with 2 additions and 4 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -513,10 +513,8 @@ public final class SystemServer {
            // Initialize native services.
            System.loadLibrary("android_servers");

-            // Debug builds - allow heap profiling.
-            if (Build.IS_DEBUGGABLE) {
-                initZygoteChildHeapProfiling();
-            }
+            // Allow heap / perf profiling.
+            initZygoteChildHeapProfiling();

            // Debug builds - spawn a thread to monitor for fd leaks.
            if (Build.IS_DEBUGGABLE) {