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

Commit 37f7971d authored by Alastair Donaldson's avatar Alastair Donaldson Committed by Automerger Merge Worker
Browse files

Merge "Add GLES dEQP level feature flag" am: bdb4677d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I841cb88a3711b8b25edbe7ef2127300e8f5802ea
parents d9ba892b bdb4677d

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -12142,6 +12142,7 @@ package android.content.pm { 
    field public static final String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";

    field public static final String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";

    field public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE = "android.hardware.nfc.ese";

    field public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE = "android.hardware.nfc.ese";

    field public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC = "android.hardware.nfc.uicc";

    field public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC = "android.hardware.nfc.uicc";

    field public static final String FEATURE_OPENGLES_DEQP_LEVEL = "android.software.opengles.deqp.level";

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

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

    field public static final String FEATURE_PC = "android.hardware.type.pc";

    field public static final String FEATURE_PC = "android.hardware.type.pc";

    field public static final String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";

    field public static final String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";

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

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

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_VULKAN_DEQP_LEVEL = "android.software.vulkan.deqp.level";

    public static final String FEATURE_VULKAN_DEQP_LEVEL = "android.software.vulkan.deqp.level";





    /**

     * Feature for {@link #getSystemAvailableFeatures} and

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

     * specifies a date such that the device is known to pass the OpenGLES dEQP test suite

     * associated with that date.  The date is encoded as follows:

     * <ul>

     * <li>Year in bits 31-16</li>

     * <li>Month in bits 15-8</li>

     * <li>Day in bits 7-0</li>

     * </ul>

     * <p>

     * Example: 2021-03-01 is encoded as 0x07E50301, and would indicate that the device passes the

     * OpenGL ES dEQP test suite version that was current on 2021-03-01.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_OPENGLES_DEQP_LEVEL = "android.software.opengles.deqp.level";



    /**

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes broadcast radio tuner.

     * {@link #hasSystemFeature}: The device includes broadcast radio tuner.