summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2014-03-17 23:32:28 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-17 23:32:28 +0000
commit20dba7e3abb355320a4d2fa3708b693330bb19ac (patch)
treecffb068b804cf2b84073a0597b3af2faadf78bc1
parent28cd297db6f28f12ad6e8f152610ada2d6b2c379 (diff)
parent80acb20ca95da161fc739abac0fb9084a76e2ced (diff)
am 80acb20c: am 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
* commit '80acb20ca95da161fc739abac0fb9084a76e2ced': Add device admin to wearables for API8 Compat
-rw-r--r--data/etc/wearable_core_hardware.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/data/etc/wearable_core_hardware.xml b/data/etc/wearable_core_hardware.xml
index b2ffab79b7..215665f7d9 100644
--- a/data/etc/wearable_core_hardware.xml
+++ b/data/etc/wearable_core_hardware.xml
@@ -36,6 +36,9 @@
<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