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

Commit fa871a36 authored by Abhijit Adsule's avatar Abhijit Adsule Committed by Gerrit Code Review
Browse files

Merge "Add feature to disable slices"

parents 3300730d 014479db

core/java/android/content/pm/PackageManager.java

+7 −0
Original line number Diff line number Diff line
@@ -2883,6 +2883,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.

services/java/com/android/server/SystemServer.java

+1 −2
Original line number Diff line number Diff line
@@ -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();