Merge "API Review: Update managed profiles feature flag."

This commit is contained in:
Adam Connors 2014-06-05 13:07:31 +00:00 committed by Android (Google) Code Review
commit 9afbf0c799
3 changed files with 3 additions and 3 deletions

View File

@ -16,5 +16,5 @@
<!-- This is the standard feature indicating that the device supports managed profiles. -->
<permissions>
<feature name="android.software.managedprofiles" />
<feature name="android.software.managed_profiles" />
</permissions>

View File

@ -46,7 +46,7 @@
<feature name="android.software.device_admin" />
<!-- Feature to specify if the device support managed profiles. -->
<feature name="android.software.managedprofiles" />
<feature name="android.software.managed_profiles" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with an autofocus camera and/or flash must include either

View File

@ -47,7 +47,7 @@
<feature name="android.software.device_admin" />
<!-- Feature to specify if the device support managed profiles. -->
<feature name="android.software.managedprofiles" />
<feature name="android.software.managed_profiles" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with a rear-facing camera must include one of these as appropriate: