diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 22:33:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 22:33:36 +0000 |
| commit | 2b554fa9d4823ee7552df5194939ca218958f8a3 (patch) | |
| tree | 96ef0654b80ccd006454cda64e5eae721a548296 /services/java/com/android/server/SystemServer.java | |
| parent | c7243a6ded82e63d241d73e880bca957556387f4 (diff) | |
| parent | fa871a3642aa910434117576bd45249a732a85ac (diff) | |
Merge "Add feature to disable slices" am: fa871a3642
Change-Id: I7b64d2b937a0ebe183440c430514e821e1174faf
Diffstat (limited to 'services/java/com/android/server/SystemServer.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 0075c994b70d..b7ffcb859d43 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"); @@ -1913,7 +1912,7 @@ public final class SystemServer { traceEnd(); } - if (!disableSlices) { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) { traceBeginAndSlog("StartSliceManagerService"); mSystemServiceManager.startService(SLICE_MANAGER_SERVICE_CLASS); traceEnd(); |