diff options
| author | 2013-09-17 15:56:23 +0000 | |
|---|---|---|
| committer | 2013-09-17 15:56:24 +0000 | |
| commit | fc7083a828b6db00698c1418e5f370b31625213c (patch) | |
| tree | abdb62ade3d2ce9fb4a87ea6463ea9d7654ddb78 | |
| parent | 2a36497e45d4d96e35fed89cfdcb09b71459ac3c (diff) | |
| parent | 7562c0e28f23acac4f5eceee27015fd43cbfb2c1 (diff) | |
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
| -rw-r--r-- | data/etc/handheld_core_hardware.xml | 2 | ||||
| -rw-r--r-- | data/etc/tablet_core_hardware.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml index 290afc2e73..4a9f2dd9aa 100644 --- a/data/etc/handheld_core_hardware.xml +++ b/data/etc/handheld_core_hardware.xml @@ -36,6 +36,8 @@ <feature name="android.software.app_widgets" /> <feature name="android.software.home_screen" /> <feature name="android.software.input_methods" /> + <!-- Feature to specify if the device supports adding device admins. --> + <feature name="android.software.device_admin" /> <!-- devices with GPS must include android.hardware.location.gps.xml --> <!-- devices with an autofocus camera and/or flash must include either android.hardware.camera.autofocus.xml or diff --git a/data/etc/tablet_core_hardware.xml b/data/etc/tablet_core_hardware.xml index 207fc9ad3d..78b9736c0f 100644 --- a/data/etc/tablet_core_hardware.xml +++ b/data/etc/tablet_core_hardware.xml @@ -37,6 +37,8 @@ <feature name="android.software.app_widgets" /> <feature name="android.software.home_screen" /> <feature name="android.software.input_methods" /> + <!-- Feature to specify if the device supports adding device admins. --> + <feature name="android.software.device_admin" /> <!-- devices with GPS must include android.hardware.location.gps.xml --> <!-- devices with a rear-facing camera must include one of these as appropriate: android.hardware.camera.xml or |