summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-09-12 14:21:03 -0700
committerAmith Yamasani <yamasani@google.com>2014-09-12 14:21:03 -0700
commit2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d (patch)
treebd4adbd7fb16ee016ab9ec1c8aa708fc56c317ff /data
parent70b9e6c8f3221bbbeefc85c70746541a5b318afc (diff)
downloadframeworks_native-2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d.zip
frameworks_native-2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d.tar.gz
frameworks_native-2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d.tar.bz2
Rename managed_profiles feature to managed_users
Bug: 17392243 Change-Id: Ib60d1563ecdda9a979196ef51e849be2f9e9f841
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.software.managed_users.xml (renamed from data/etc/android.software.managed_profiles.xml)4
-rw-r--r--data/etc/handheld_core_hardware.xml4
-rw-r--r--data/etc/tablet_core_hardware.xml4
3 files changed, 6 insertions, 6 deletions
diff --git a/data/etc/android.software.managed_profiles.xml b/data/etc/android.software.managed_users.xml
index 532a543..56affe9 100644
--- a/data/etc/android.software.managed_profiles.xml
+++ b/data/etc/android.software.managed_users.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<!-- This is the standard feature indicating that the device supports managed profiles. -->
+<!-- This is the standard feature indicating that the device supports managed users. -->
<permissions>
- <feature name="android.software.managed_profiles" />
+ <feature name="android.software.managed_users" />
</permissions>
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml
index 7d70a5d..d923eec 100644
--- a/data/etc/handheld_core_hardware.xml
+++ b/data/etc/handheld_core_hardware.xml
@@ -46,8 +46,8 @@
<!-- Feature to specify if the device supports adding device admins. -->
<feature name="android.software.device_admin" />
- <!-- Feature to specify if the device support managed profiles. -->
- <feature name="android.software.managed_profiles" />
+ <!-- Feature to specify if the device support managed users. -->
+ <feature name="android.software.managed_users" />
<!-- 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 321b2af..8128165 100644
--- a/data/etc/tablet_core_hardware.xml
+++ b/data/etc/tablet_core_hardware.xml
@@ -47,8 +47,8 @@
<!-- Feature to specify if the device supports adding device admins. -->
<feature name="android.software.device_admin" />
- <!-- Feature to specify if the device support managed profiles. -->
- <feature name="android.software.managed_profiles" />
+ <!-- Feature to specify if the device support managed users. -->
+ <feature name="android.software.managed_users" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with a rear-facing camera must include one of these as appropriate: