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

Commit 757c168f authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge changes from topics "avf-sys-feature", "move-avf-jar-to-bcp" 

* changes:
  Add com.android.virt-bootclasspath-fragment
  Add FEATURE_VIRTUALIZATION_FRAMEWORK system feature
parents 25b16b3d ceff6b8f

boot/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,10 @@ platform_bootclasspath { 
            apex: "com.android.car.framework",

            module: "com.android.car.framework-bootclasspath-fragment",

        },

        {

            apex: "com.android.virt",

            module: "com.android.virt-bootclasspath-fragment",

        },

    ],



    // Additional information needed by hidden api processing.

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3406,6 +3406,7 @@ package android.content.pm { 
    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_IMS_SINGLE_REGISTRATION = "android.hardware.telephony.ims.singlereg";

    field public static final String FEATURE_VIRTUALIZATION_FRAMEWORK = "android.software.virtualization_framework";

    field public static final int FLAGS_PERMISSION_RESERVED_PERMISSION_CONTROLLER = -268435456; // 0xf0000000

    field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000

    field public static final int FLAG_PERMISSION_AUTO_REVOKED = 131072; // 0x20000

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

+12 −0
Original line number Diff line number Diff line
@@ -2944,6 +2944,18 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";



    /**

     * Feature for {@link #getSystemAvailableFeatures()} and {@link #hasSystemFeature(String)}.

     * This feature indicates whether device supports

     * <a href="https://source.android.com/docs/core/virtualization">Android Virtualization Framework</a>.

     *

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_VIRTUALIZATION_FRAMEWORK =

            "android.software.virtualization_framework";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature(String, int)}: If this feature is supported, the Vulkan