summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-04-23 13:19:53 -0700
committerAdam Lesinski <adamlesinski@google.com>2014-05-01 14:29:47 -0700
commit0cb8c48c4b250eb18f85f8fe0178757ea9b4ba68 (patch)
tree7e9202ce6b410d10b13c8758bfdfe5341c20e622 /data
parentf3c07d4f70f33c2fe5b14ca8fbcdfa4133cc72c7 (diff)
downloadframeworks_native-0cb8c48c4b250eb18f85f8fe0178757ea9b4ba68.zip
frameworks_native-0cb8c48c4b250eb18f85f8fe0178757ea9b4ba68.tar.gz
frameworks_native-0cb8c48c4b250eb18f85f8fe0178757ea9b4ba68.tar.bz2
Remove some features from wearables
It was incorrectly assumed that these devices must require a device admin, camera, and network location. Change-Id: I51942ece6c0b9f824bfc3ee82917a2496ae81788
Diffstat (limited to 'data')
-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 215665f..e256742 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