From d598dc2325426a8766a444a8cabe1c0bf2849b19 Mon Sep 17 00:00:00 2001 From: Jeremy Joslin Date: Thu, 21 Jan 2021 13:59:57 -0800 Subject: [PATCH] New feature: FEATURE_SECURITY_MODEL_COMPATIBLE Adding a new public system feature constant that must be expressed by devices that support Android's security model as documented in the CDD. Test: Build Bug: 173540259 Change-Id: Ib651ab31cba065fc9b2a28d8ac16eaa85357f252 --- core/api/current.txt | 1 + core/java/android/content/pm/PackageManager.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index 4f45f310921e7..492d60f7ac26f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12383,6 +12383,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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 747f8dc4915c5..0433db451d4be 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -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