Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 014479db authored by Abhijit Adsule's avatar Abhijit Adsule
Browse files

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
parent 65be777f
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -2866,6 +2866,13 @@ public abstract class PackageManager {
    @SdkConstant(SdkConstantType.FEATURE)
    public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";

    /**
     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
     * The device does not have a slices implementation.
     * @hide
     */
    @SdkConstant(SdkConstantType.FEATURE)
    public static final String FEATURE_SLICES_DISABLED = "android.software.slices_disabled";
    /**
     * Extra field name for the URI to a verification file. Passed to a package
     * verifier.
+1 −2
Original line number Diff line number Diff line
@@ -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();