am 1f9f945c: am 19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev

* commit '1f9f945c8d66aab510df82a931c2328b3f6a2acd':
  Remove some features from wearables
This commit is contained in:
Adam Lesinski 2014-05-01 21:37:35 +00:00 committed by Android Git Automerger
commit c526c35e73

View File

@ -21,9 +21,7 @@
Wearable devices include watches, glasses, backpacks, and sweaters. Wearable devices include watches, glasses, backpacks, and sweaters.
--> -->
<permissions> <permissions>
<feature name="android.hardware.camera" />
<feature name="android.hardware.location" /> <feature name="android.hardware.location" />
<feature name="android.hardware.location.network" />
<feature name="android.hardware.sensor.compass" /> <feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" /> <feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" /> <feature name="android.hardware.bluetooth" />
@ -34,11 +32,9 @@
<!-- basic system services --> <!-- basic system services -->
<feature name="android.software.home_screen" /> <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 GPS must include android.hardware.location.gps.xml -->
<!-- devices with an autofocus camera and/or flash must include either <!-- devices with an autofocus camera and/or flash must include either
android.hardware.camera.autofocus.xml or android.hardware.camera.autofocus.xml or