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

Commit 967b8101 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Remove INCREMENTAL_VERSION and add version to INCREMENTAL feature." into sc-dev

parents 9995d6ca 78c789d3

core/api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -2552,8 +2552,7 @@ package android.content.pm { 
    field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";

    field public static final String FEATURE_CAMERA_TOGGLE = "android.hardware.camera.toggle";

    field public static final String FEATURE_CONTEXT_HUB = "android.hardware.context_hub";

    field @Deprecated public static final String FEATURE_INCREMENTAL_DELIVERY = "android.software.incremental_delivery";

    field public static final String FEATURE_INCREMENTAL_DELIVERY_VERSION = "android.software.incremental_delivery_version";

    field public static final String FEATURE_INCREMENTAL_DELIVERY = "android.software.incremental_delivery";

    field public static final String FEATURE_MICROPHONE_TOGGLE = "android.hardware.microphone.toggle";

    field public static final String FEATURE_REBOOT_ESCROW = "android.hardware.reboot_escrow";

    field public static final String FEATURE_TELEPHONY_CARRIERLOCK = "android.hardware.telephony.carrierlock";

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

+3 −15
Original line number Diff line number Diff line
@@ -3584,30 +3584,18 @@ public abstract class PackageManager { 
     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has

     * the requisite kernel support to support incremental delivery aka Incremental FileSystem.

     *

     * @see IncrementalManager#isFeatureEnabled

     * @hide

     *

     * @deprecated Use {@link #FEATURE_INCREMENTAL_DELIVERY_VERSION} instead.

     */

    @Deprecated

    @SystemApi

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_INCREMENTAL_DELIVERY =

            "android.software.incremental_delivery";



    /**

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

     * feature not present - IncFs is not present on the device.

     * 1 - IncFs v1, core features, no PerUid support. Optional in R.

     * 2 - IncFs v2, PerUid support, fs-verity support. Required in S.

     *

     * @see IncrementalManager#isFeatureEnabled

     * @see IncrementalManager#getVersion()

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_INCREMENTAL_DELIVERY_VERSION =

            "android.software.incremental_delivery_version";

    public static final String FEATURE_INCREMENTAL_DELIVERY =

            "android.software.incremental_delivery";



    /**

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

core/java/com/android/server/SystemConfig.java

+1 −2
Original line number Diff line number Diff line
@@ -1234,8 +1234,7 @@ public class SystemConfig { 


        final int incrementalVersion = IncrementalManager.getVersion();

        if (incrementalVersion > 0) {

            addFeature(PackageManager.FEATURE_INCREMENTAL_DELIVERY, 0);

            addFeature(PackageManager.FEATURE_INCREMENTAL_DELIVERY_VERSION, incrementalVersion);

            addFeature(PackageManager.FEATURE_INCREMENTAL_DELIVERY, incrementalVersion);

        }



        if (PackageManager.APP_ENUMERATION_ENABLED_BY_DEFAULT) {