diff options
| author | 2014-09-10 10:07:13 +0000 | |
|---|---|---|
| committer | 2014-09-10 10:07:15 +0000 | |
| commit | c90f95c79ddd930c3fba13352f15ce7666eca402 (patch) | |
| tree | 2c54ce73d551b3aa889e524c6654161c38d88439 | |
| parent | f8eef096223301d855bc726f7c2f8df2183ceb10 (diff) | |
| parent | 19ccb5fd759dc9284da32320ed1219bee3e031be (diff) | |
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a2d146588367..0d1cee422d7e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8907,6 +8907,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_PRINTING = "android.software.print"; field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape"; field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait"; + field public static final java.lang.String FEATURE_SECURELY_REMOVES_USERS = "android.software.securely_removes_users"; field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer"; field public static final java.lang.String FEATURE_SENSOR_AMBIENT_TEMPERATURE = "android.hardware.sensor.ambient_temperature"; field public static final java.lang.String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer"; @@ -8931,6 +8932,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand"; field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; + field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; field public static final java.lang.String FEATURE_WEBVIEW = "android.software.webview"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 36d15a08cc2d..5ce968b5e0d9 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1525,6 +1525,22 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: + * The device supports verified boot. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: + * The device supports secure removal of users. When a user is deleted the data associated + * with that user is securely deleted and no longer available. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_SECURELY_REMOVES_USERS + = "android.software.securely_removes_users"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: * The device has a full implementation of the android.webkit.* APIs. Devices * lacking this feature will not have a functioning WebView implementation. */ |