From 876e06aa979df8da8fa8edb458fff5d4cf356860 Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Wed, 1 Apr 2020 09:59:53 +0100
Subject: [PATCH] Make system_server profilable on user.

Test: m with matching SELinux change. profile sys_srv.

This is a cherry-pick of be583be3ed6a53d3de6c4949a7c9754ec7fee3ed.

Bug: 151140716
Change-Id: I545b758421ea7527d75b5d2756a6b11ae475e7de
Merged-In: I545b758421ea7527d75b5d2756a6b11ae475e7de
---
 services/java/com/android/server/SystemServer.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 2a914ecf4db64..e5ffbacb357b3 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -519,10 +519,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) {