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

Commit de162a46 authored by Jeremy Joslin's avatar Jeremy Joslin Committed by Android (Google) Code Review
Browse files

Merge "New feature: FEATURE_SECURITY_MODEL_COMPATIBLE"

parents fdebebe1 d598dc23

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12384,6 +12384,7 @@ package android.content.pm { 
    field public static final String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

    field public static final String FEATURE_SECURELY_REMOVES_USERS = "android.software.securely_removes_users";

    field public static final String FEATURE_SECURE_LOCK_SCREEN = "android.software.secure_lock_screen";

    field public static final String FEATURE_SECURITY_MODEL_COMPATIBLE = "android.hardware.security.model.compatible";

    field public static final String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";

    field public static final String FEATURE_SENSOR_AMBIENT_TEMPERATURE = "android.hardware.sensor.ambient_temperature";

    field public static final String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";

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

+8 −0
Original line number Diff line number Diff line
@@ -2587,6 +2587,14 @@ public abstract class PackageManager { 
    @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 is compatible with Android’s security model.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SECURITY_MODEL_COMPATIBLE =

            "android.hardware.security.model.compatible";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports the OpenGL ES