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

Commit c8a82f5e authored by Galia Peycheva's avatar Galia Peycheva Committed by Android (Google) Code Review
Browse files

Merge "Add blur feature to package manager"

parents 4eae4059 36ba33e6

core/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -2344,6 +2344,7 @@ package android.content.pm { 
    field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";

    field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";

    field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";

    field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";

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

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

    field public static final String FEATURE_CROSS_LAYER_BLUR = "android.software.cross_layer_blur";

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

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

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

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

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

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

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -3532,6 +3532,17 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_APP_ENUMERATION = "android.software.app_enumeration";

    public static final String FEATURE_APP_ENUMERATION = "android.software.app_enumeration";





    /**

     * Feature for {@link android.view.WindowManager.LayoutParams.backgroundBlurRedius} and

     * {@link android.graphics.drawable.BackgroundBlurDrawable}: the device supports cross-layer

     * blurring.

     *

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CROSS_LAYER_BLUR = "android.software.cross_layer_blur";



    /** @hide */

    /** @hide */

    public static final boolean APP_ENUMERATION_ENABLED_BY_DEFAULT = true;

    public static final boolean APP_ENUMERATION_ENABLED_BY_DEFAULT = true;

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,9 @@ public class SystemConfig { 
    // property for runtime configuration differentiation in vendor

    // property for runtime configuration differentiation in vendor

    private static final String VENDOR_SKU_PROPERTY = "ro.boot.product.vendor.sku";

    private static final String VENDOR_SKU_PROPERTY = "ro.boot.product.vendor.sku";





    // property for background blur support in surface flinger

    private static final String BLUR_PROPERTY = "ro.surface_flinger.supports_background_blur";



    // Group-ids that are given to all packages as read from etc/permissions/*.xml.

    // Group-ids that are given to all packages as read from etc/permissions/*.xml.

    int[] mGlobalGids = EmptyArray.INT;

    int[] mGlobalGids = EmptyArray.INT;
@@ -1242,6 +1245,10 @@ public class SystemConfig { 
            addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0);

            addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0);

        }

        }





        if (SystemProperties.get(BLUR_PROPERTY, "default").equals("1")) {

            addFeature(PackageManager.FEATURE_CROSS_LAYER_BLUR, 0);

        }



        for (String featureName : mUnavailableFeatures) {

        for (String featureName : mUnavailableFeatures) {

            removeFeature(featureName);

            removeFeature(featureName);

        }

        }