diff options
| author | Yi Kong <yikong@google.com> | 2020-11-03 10:47:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-03 10:47:16 +0000 |
| commit | ffbd8ee48709c548234d9b8f9f9ab2ee3c836797 (patch) | |
| tree | 97991078a8549032608ab12b1d619d507903314b /services/java/com/android | |
| parent | 9856a86adba9ae22de0fc8e15960a4167682dc06 (diff) | |
| parent | de81949fe4a75d08bee0bf860ebb08af89631aa8 (diff) | |
Merge "profcollectd: Only start the forwarding service if enabled through device config" am: fb8f388ce7 am: f69edfbddf am: de81949fe4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484896
Change-Id: Icac75d15493ab3b7c83fdb5d1c167244a98585f4
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index f495cc00bf31..b5c5bb52d050 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1232,7 +1232,7 @@ public final class SystemServer { mSystemServiceManager.startService(IorapForwardingService.class); t.traceEnd(); - if (Build.IS_DEBUGGABLE) { + if (Build.IS_DEBUGGABLE && ProfcollectForwardingService.enabled()) { t.traceBegin("ProfcollectForwardingService"); mSystemServiceManager.startService(ProfcollectForwardingService.class); t.traceEnd(); |