diff options
| author | Yi Kong <yikong@google.com> | 2020-11-03 10:59:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-03 10:59:11 +0000 |
| commit | 8c20d86f917a8966d8f46979336232eff28aeef6 (patch) | |
| tree | 321abf8f2935604a0687776f479f02a3402998af /services/java/com/android/server | |
| parent | 0556dc7f5a770e29d04d07475fee332e8219f877 (diff) | |
| parent | ffbd8ee48709c548234d9b8f9f9ab2ee3c836797 (diff) | |
Merge "profcollectd: Only start the forwarding service if enabled through device config" am: fb8f388ce7 am: f69edfbddf am: de81949fe4 am: ffbd8ee487
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484896
Change-Id: I2ed9be0bfbb31d52d1f36db6653cc2baca51364f
Diffstat (limited to 'services/java/com/android/server')
| -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 267c9b7e40f7..dfa726f1bfc8 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1345,7 +1345,7 @@ public final class SystemServer implements Dumpable { 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(); |