summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2014-05-01 21:30:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-05-01 21:30:43 +0000
commit19f7cd5c635b295e3e15ca2129a1f24fe9df98ec (patch)
treedcd2d0662c711fca099b9785ab270aeac2c2d476
parent85453ecc90a94564e586f0f97c9ec2c0cf831501 (diff)
parent0cb8c48c4b250eb18f85f8fe0178757ea9b4ba68 (diff)
Merge "Remove some features from wearables" into klp-modular-dev
-rw-r--r--data/etc/wearable_core_hardware.xml8
1 files changed, 2 insertions, 6 deletions
diff --git a/data/etc/wearable_core_hardware.xml b/data/etc/wearable_core_hardware.xml
index 215665f7d9..e256742ece 100644
--- a/data/etc/wearable_core_hardware.xml
+++ b/data/etc/wearable_core_hardware.xml
@@ -21,9 +21,7 @@
Wearable devices include watches, glasses, backpacks, and sweaters.
-->
<permissions>
- <feature name="android.hardware.camera" />
<feature name="android.hardware.location" />
- <feature name="android.hardware.location.network" />
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
@@ -34,11 +32,9 @@
<!-- basic system services -->
<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 that support a device administrator policy must include
+ android.software.device_admin.xml -->
<!-- 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