diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index a543cbf..6417fac 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7804,6 +7804,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_MANAGEDPROFILES = "android.software.managedprofiles"; 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 ceb7764..3300e9d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1316,6 +1316,13 @@ public abstract class PackageManager { public static final String FEATURE_BACKUP = "android.software.backup"; /** + * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: + * The device supports managed profiles for enterprise users. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_MANAGEDPROFILES = "android.software.managedprofiles"; + + /** * Action to external storage service to clean out removed apps. * @hide */ @@ -2490,7 +2497,7 @@ public abstract class PackageManager { /** * Return the generic icon for an activity that is used when no specific * icon is defined. - * + * * @return Drawable Image of the icon. */ public abstract Drawable getDefaultActivityIcon(); |