From 1d653272a2847c0cda10482f70e991e7afdaee4b Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 11 Sep 2014 17:56:05 -0700 Subject: [PATCH] Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS Bug: 17392243 Change-Id: I5ff0e70eeeeba264c96eaa2a17a6bd3669576c96 --- api/current.txt | 2 +- core/java/android/content/pm/PackageManager.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index e9da3987f4f9c..6aa5180eb1f59 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8905,7 +8905,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location"; field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps"; field public static final java.lang.String FEATURE_LOCATION_NETWORK = "android.hardware.location.network"; - field public static final java.lang.String FEATURE_MANAGED_PROFILES = "android.software.managed_profiles"; + field public static final java.lang.String FEATURE_MANAGED_USERS = "android.software.managed_users"; field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone"; field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc"; field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 8f3d90fcf9dc3..3fc9b679ac2fc 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -23,6 +23,7 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; import android.app.PackageDeleteObserver; import android.app.PackageInstallObserver; +import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -1518,10 +1519,17 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: - * The device supports managed profiles for enterprise users. + * The device supports creating secondary users and managed profiles via + * {@link DevicePolicyManager}. */ @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_MANAGED_PROFILES = "android.software.managed_profiles"; + public static final String FEATURE_MANAGED_USERS = "android.software.managed_users"; + + /** + * @hide + * TODO: Remove after dependencies updated b/17392243 + */ + public static final String FEATURE_MANAGED_PROFILES = "android.software.managed_users"; /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: