diff options
| author | Alastair Donaldson <afdx@google.com> | 2020-12-17 16:52:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 16:52:58 +0000 |
| commit | cff7cd0d2182b34c7e3d6667affe208e063b1ae5 (patch) | |
| tree | b2ceab9fa99122eede10b23dbb45f01c13861701 | |
| parent | 03a4d08fed7976f5d4b1de60027dbd5ea486d443 (diff) | |
| parent | 37f7971dfd54eb51a04446f884de0dca1bcb69b4 (diff) | |
Merge "Add GLES dEQP level feature flag" am: bdb4677dc4 am: 37f7971dfd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibeeb17f80cf83291845aee52c00b1c9b3b6e3428
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 7628ab334bae..6e8adff46b16 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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_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_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_PC = "android.hardware.type.pc"; field public static final String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5d872416c807..54878dda4331 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2381,6 +2381,23 @@ public abstract class PackageManager { /** * 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 * {@link #hasSystemFeature}: The device includes broadcast radio tuner. * @hide */ |