From 014479dbb6568f9158dedd8f1cdf59cad3c7d072 Mon Sep 17 00:00:00 2001 From: Abhijit Adsule Date: Fri, 11 Oct 2019 18:24:41 -0700 Subject: Add feature to disable slices Bug: 142022263 Test: Manual - Verified CTS test passes on devices where the feature is disabled Change-Id: I090b4c1460fcc4784e9e901847829ee61bfc31ef Merged-In: I090b4c1460fcc4784e9e901847829ee61bfc31ef --- services/java/com/android/server/SystemServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'services/java') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b93365ad0ad5..1b4f33e42172 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -938,7 +938,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"); @@ -1910,7 +1909,7 @@ public final class SystemServer { traceEnd(); } - if (!disableSlices) { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) { traceBeginAndSlog("StartSliceManagerService"); mSystemServiceManager.startService(SLICE_MANAGER_SERVICE_CLASS); traceEnd(); -- cgit v1.2.3-59-g8ed1b