API Review: Update managed profiles feature flag.

Feature flag renamed to FEATURE_MANAGED_PROFILES

Bug: 15025371

Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
(cherry picked from commit 17e4e6b62b12cc7f11c07f737f9290e2ecfc6cc4)

diff --git a/data/etc/android.software.managedprofiles.xml b/data/etc/android.software.managed_profiles.xml
similarity index 93%
rename from data/etc/android.software.managedprofiles.xml
rename to data/etc/android.software.managed_profiles.xml
index 233a78d..532a543 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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: