summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-07 09:55:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-07 09:55:41 +0000
commit037c5453355db17401d47ebf185ed384f5637b40 (patch)
tree734b4a02bc47e26e1a5e6d133183b7fa7be0a8bd /services/java/com/android/server/SystemServer.java
parentdcb31d4b7eebca70cacad1e7320493513354b36b (diff)
parent4b500ced328b3e89456a79fe5287d2e7d8dcc394 (diff)
Merge "Make system_server profilable on user." into rvc-dev am: 4b500ced32
Change-Id: I57df67e59b6ed1187e0bb0893f6020d9f62f489f
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index c0c21bb8266d..542d241c6585 100644
--- 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) {