commit d423986e68d76958441c3bec1584a86f7f390988
author Adam Connors <adamconnors@google.com> Fri Apr 04 14:40:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 04 14:40:20 2014 +0000
tree 73b07a8490f3ab95a23e31af027199ec31b7c356
parent e4c3dfa7b6ef3819c9c0599c8f301eb4de30f2c5
parent 23cc04e598cfb1c7f10e3fab05b188a8738edb35

Merge "Add android.software.managedprofiles feature flag."

api/current.txt

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 @@
     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";

core/java/android/content/pm/PackageManager.java

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 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 @@
     /**
      * 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();