summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack Yu <jackcwyu@google.com> 2019-07-24 07:02:39 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-24 07:02:39 -0700
commit3e2865f5854d8858ba651183e9d36bf6c8e7c900 (patch)
tree6938fd60c37690d4c9198e9f26f87dbdd172d7a6
parent4657a1648c11492773f8c67b8e9e51803ed7cb6b (diff)
parent65e73f09fd206c8aaa1a6a8654120b9f2f2d1d86 (diff)
Merge "Create feature flags for OMAPI readers supportiveness"
am: 65e73f09fd Change-Id: I72b65959dab75fcca8566d6eecd7a730ef044d94
-rw-r--r--api/current.txt3
-rw-r--r--core/java/android/content/pm/PackageManager.java24
2 files changed, 27 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7fbd84bbf571..44d480b9e313 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11742,6 +11742,9 @@ package android.content.pm {
field public static final String FEATURE_SENSOR_RELATIVE_HUMIDITY = "android.hardware.sensor.relative_humidity";
field public static final String FEATURE_SENSOR_STEP_COUNTER = "android.hardware.sensor.stepcounter";
field public static final String FEATURE_SENSOR_STEP_DETECTOR = "android.hardware.sensor.stepdetector";
+ field public static final String FEATURE_SE_OMAPI_ESE = "android.hardware.se.omapi.ese";
+ field public static final String FEATURE_SE_OMAPI_SD = "android.hardware.se.omapi.sd";
+ field public static final String FEATURE_SE_OMAPI_UICC = "android.hardware.se.omapi.uicc";
field public static final String FEATURE_SIP = "android.software.sip";
field public static final String FEATURE_SIP_VOIP = "android.software.sip.voip";
field public static final String FEATURE_STRONGBOX_KEYSTORE = "android.hardware.strongbox_keystore";
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index e08f4a28e77c..1a44aa1ee46c 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2043,6 +2043,30 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device supports Open Mobile API capable UICC-based secure
+ * elements.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SE_OMAPI_UICC = "android.hardware.se.omapi.uicc";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device supports Open Mobile API capable eSE-based secure
+ * elements.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SE_OMAPI_ESE = "android.hardware.se.omapi.ese";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device supports Open Mobile API capable SD-based secure
+ * elements.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SE_OMAPI_SD = "android.hardware.se.omapi.sd";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device supports the OpenGL ES
* <a href="http://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt">
* Android Extension Pack</a>.