summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-09-16 10:44:57 -0700
committerAmith Yamasani <yamasani@google.com>2013-09-16 17:24:06 -0700
commit44a01b742c2ad2ebc6185425be887b4bc987c4d0 (patch)
tree997f71583c0c070399de993ded83d98b292f56d4 /api
parent1656a346d9b69470cf8336a3059e9624797c7b7d (diff)
downloadframeworks_base-44a01b742c2ad2ebc6185425be887b4bc987c4d0.zip
frameworks_base-44a01b742c2ad2ebc6185425be887b4bc987c4d0.tar.gz
frameworks_base-44a01b742c2ad2ebc6185425be887b4bc987c4d0.tar.bz2
Add a feature to specify if device admins are supported on the device
Bug: 9520957 DevicePolicyManagerService will play dumb if the feature is not installed. Continue to keep track of failed password attempts for keyguard's use. Change-Id: I28d258dc09a8b4976b188da6f453d8daabcc4bdd
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 4624c60..9e2a252 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7258,6 +7258,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";
field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";
+ field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";
field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";
field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";