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

Change-Id: Ica8d586c2346652d62b0a6c200b6f228d397b6aa
2020-04-07 10:21:24 +00:00
parent f52fe60161 8dbf276d7f
commit e04f0e02bb
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) {