summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorAdam Connors <adamconnors@google.com>2014-06-05 12:24:27 +0100
committerAdam Connors <adamconnors@google.com>2014-06-05 12:57:54 +0000
commit17e4e6b62b12cc7f11c07f737f9290e2ecfc6cc4 (patch)
treec0c499c6949e148e0b0fee9674c0d3e0809d2f37 /data
parentb09b936d8ec7f1afe77f4f53ff4d4920c8b59092 (diff)
downloadframeworks_native-17e4e6b62b12cc7f11c07f737f9290e2ecfc6cc4.zip
frameworks_native-17e4e6b62b12cc7f11c07f737f9290e2ecfc6cc4.tar.gz
frameworks_native-17e4e6b62b12cc7f11c07f737f9290e2ecfc6cc4.tar.bz2
API Review: Update managed profiles feature flag.
Feature flag renamed to FEATURE_MANAGED_PROFILES Bug: 15025371 Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.software.managed_profiles.xml (renamed from data/etc/android.software.managedprofiles.xml)2
-rw-r--r--data/etc/handheld_core_hardware.xml2
-rw-r--r--data/etc/tablet_core_hardware.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/etc/android.software.managedprofiles.xml b/data/etc/android.software.managed_profiles.xml
index 233a78d..532a543 100644
--- a/data/etc/android.software.managedprofiles.xml
+++ b/data/etc/android.software.managed_profiles.xml
@@ -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>
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml
index f0c9e67..f18e4b1 100644
--- a/data/etc/handheld_core_hardware.xml
+++ b/data/etc/handheld_core_hardware.xml
@@ -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
diff --git a/data/etc/tablet_core_hardware.xml b/data/etc/tablet_core_hardware.xml
index 9d217ea..4db2e57 100644
--- a/data/etc/tablet_core_hardware.xml
+++ b/data/etc/tablet_core_hardware.xml
@@ -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: