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

Commit 4fffc3eb authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Create feature flags for OMAPI readers supportiveness" am: 65e73f09 

am: 3e2865f5

Change-Id: I1c86601d6ee02619ee0d0cdad7cefd51e2a95989
parents 8cd2973a 3e2865f5

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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";

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

+24 −0
Original line number Diff line number Diff line
@@ -2041,6 +2041,30 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_NFC_ANY = "android.hardware.nfc.any";



    /**

     * 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