From: Amith Yamasani <yamasani@google.com>
Date: Fri, 12 Sep 2014 21:21:03 +0000 (-0700)
Subject: Rename managed_profiles feature to managed_users
X-Git-Tag: android-x86-6.0-r1~270^2~93
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d;p=android-x86%2Fframeworks-native.git

Rename managed_profiles feature to managed_users

Bug: 17392243
Change-Id: Ib60d1563ecdda9a979196ef51e849be2f9e9f841
---

diff --git a/data/etc/android.software.managed_profiles.xml b/data/etc/android.software.managed_users.xml
similarity index 89%
rename from data/etc/android.software.managed_profiles.xml
rename to data/etc/android.software.managed_users.xml
index 532a543d85..56affe9232 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 7d70a5df95..d923eec00f 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 321b2afc54..8128165f5f 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: