diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-05-01 21:33:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 21:33:56 +0000 |
| commit | 1f9f945c8d66aab510df82a931c2328b3f6a2acd (patch) | |
| tree | 0bf89e7fceecf6f7511e4c48840959b6c4c9f253 /data | |
| parent | fc4e37887707588d18297188dd6922224901b8d0 (diff) | |
| parent | 19f7cd5c635b295e3e15ca2129a1f24fe9df98ec (diff) | |
| download | frameworks_native-1f9f945c8d66aab510df82a931c2328b3f6a2acd.zip frameworks_native-1f9f945c8d66aab510df82a931c2328b3f6a2acd.tar.gz frameworks_native-1f9f945c8d66aab510df82a931c2328b3f6a2acd.tar.bz2 | |
am 19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev
* commit '19f7cd5c635b295e3e15ca2129a1f24fe9df98ec':
Remove some features from wearables
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/wearable_core_hardware.xml | 8 |
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 |