From 2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Fri, 12 Sep 2014 14:21:03 -0700
Subject: Rename managed_profiles feature to managed_users

Bug: 17392243
Change-Id: Ib60d1563ecdda9a979196ef51e849be2f9e9f841
---
 data/etc/android.software.managed_profiles.xml | 20 --------------------
 data/etc/android.software.managed_users.xml    | 20 ++++++++++++++++++++
 data/etc/handheld_core_hardware.xml            |  4 ++--
 data/etc/tablet_core_hardware.xml              |  4 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 data/etc/android.software.managed_profiles.xml
 create mode 100644 data/etc/android.software.managed_users.xml

(limited to 'data')

diff --git a/data/etc/android.software.managed_profiles.xml b/data/etc/android.software.managed_profiles.xml
deleted file mode 100644
index 532a543..0000000
--- a/data/etc/android.software.managed_profiles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This is the standard feature indicating that the device supports managed profiles. -->
-<permissions>
-    <feature name="android.software.managed_profiles" />
-</permissions>
diff --git a/data/etc/android.software.managed_users.xml b/data/etc/android.software.managed_users.xml
new file mode 100644
index 0000000..56affe9
--- /dev/null
+++ b/data/etc/android.software.managed_users.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- This is the standard feature indicating that the device supports managed users. -->
+<permissions>
+    <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:
-- 
cgit v1.1