am fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev

* commit 'fc7083a828b6db00698c1418e5f370b31625213c':
  Enable FEATURE_DEVICE_ADMIN for handheld devices
This commit is contained in:
Amith Yamasani 2013-09-17 08:58:55 -07:00 committed by Android Git Automerger
commit 3e08bb7668
2 changed files with 4 additions and 0 deletions

View File

@ -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

View File

@ -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