diff options
| author | 2020-02-28 22:13:01 +0000 | |
|---|---|---|
| committer | 2020-02-28 22:13:01 +0000 | |
| commit | fa871a3642aa910434117576bd45249a732a85ac (patch) | |
| tree | 82dcfdd3134ccb785f3304c402594dfa1aa20fd2 /services/java | |
| parent | 3300730d3d332945cc7fee07f0b8db34c4dfa058 (diff) | |
| parent | 014479dbb6568f9158dedd8f1cdf59cad3c7d072 (diff) | |
Merge "Add feature to disable slices"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index de7ae5509a18..670ec31d7616 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -939,7 +939,6 @@ public final class SystemServer { false); boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice", false); - boolean disableSlices = SystemProperties.getBoolean("config.disable_slices", false); boolean enableLeftyService = SystemProperties.getBoolean("config.enable_lefty", false); boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1"); @@ -1911,7 +1910,7 @@ public final class SystemServer { traceEnd(); } - if (!disableSlices) { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) { traceBeginAndSlog("StartSliceManagerService"); mSystemServiceManager.startService(SLICE_MANAGER_SERVICE_CLASS); traceEnd(); |