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

Commit d5d0c8b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add feature to disable slices"

parents 52102152 95862c57

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

+8 −0
Original line number Diff line number Diff line
@@ -2856,6 +2856,14 @@ public abstract class PackageManager { 
    public static final String FEATURE_STRONGBOX_KEYSTORE =

            "android.hardware.strongbox_keystore";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device does not have slices implementation.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SLICES_DISABLED = "android.software.slices_disabled";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports device-unique Keystore attestations.  Only available on devices that

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

+1 −2
Original line number Diff line number Diff line
@@ -921,7 +921,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");
@@ -1856,7 +1855,7 @@ public final class SystemServer { 
            t.traceEnd();

        }



        if (!disableSlices) {

        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) {

            t.traceBegin("StartSliceManagerService");

            mSystemServiceManager.startService(SLICE_MANAGER_SERVICE_CLASS);

            t.traceEnd();