summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2017-06-01 17:17:23 -0700
committer Andreas Gampe <agampe@google.com> 2017-06-07 20:08:44 +0000
commitdc7f65ac64af0a8f1d1b63a7772fc7c8ad56e2c2 (patch)
tree03afa08b49b71d8707e7da30d52cf10c9d81d689 /services/java
parentcab35e9b0e68ec78d2f48b6de353a95530ee60cb (diff)
Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This CL removes the code parts. (cherry picked from commit d52cad2cc9af5eb54b28b69fa5b8242258e590ae) Bug: 37272346 Test: m Test: Device boots Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java30
1 files changed, 0 insertions, 30 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e8920cdd9511..ec1a569b5dd9 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -55,7 +55,6 @@ import com.android.internal.app.NightDisplayController;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.notification.SystemNotificationChannels;
import com.android.internal.os.BinderInternal;
-import com.android.internal.os.SamplingProfilerIntegration;
import com.android.internal.util.EmergencyAffordanceManager;
import com.android.internal.util.ConcurrentUtils;
import com.android.internal.widget.ILockSettings;
@@ -325,18 +324,6 @@ public final class SystemServer {
// the property. http://b/11463182
SystemProperties.set("persist.sys.dalvik.vm.lib.2", VMRuntime.getRuntime().vmLibrary());
- // Enable the sampling profiler.
- if (SamplingProfilerIntegration.isEnabled()) {
- SamplingProfilerIntegration.start();
- mProfilerSnapshotTimer = new Timer();
- mProfilerSnapshotTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- SamplingProfilerIntegration.writeSnapshot("system_server", null);
- }
- }, SNAPSHOT_INTERVAL, SNAPSHOT_INTERVAL);
- }
-
// Mmmmmm... more memory!
VMRuntime.getRuntime().clearGrowthLimit();
@@ -705,8 +692,6 @@ public final class SystemServer {
false);
boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices",
false);
- boolean disableSamplingProfiler = SystemProperties.getBoolean("config.disable_samplingprof",
- false);
boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", false);
boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false);
boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
@@ -1336,21 +1321,6 @@ public final class SystemServer {
}
traceEnd();
- if (!disableSamplingProfiler) {
- traceBeginAndSlog("StartSamplingProfilerService");
- try {
- // need to add this service even if SamplingProfilerIntegration.isEnabled()
- // is false, because it is this service that detects system property change and
- // turns on SamplingProfilerIntegration. Plus, when sampling profiler doesn't work,
- // there is little overhead for running this service.
- ServiceManager.addService("samplingprofiler",
- new SamplingProfilerService(context));
- } catch (Throwable e) {
- reportWtf("starting SamplingProfiler Service", e);
- }
- traceEnd();
- }
-
if (!disableNetwork && !disableNetworkTime) {
traceBeginAndSlog("StartNetworkTimeUpdateService");
try {