Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Connors
2014-04-04 14:40:20 +00:00
committed by Android (Google) Code Review
parent e4c3dfa7b6 23cc04e598
commit d423986e68
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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 = "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_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_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_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 = "android.hardware.nfc";
field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce"; field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";

9
core/java/android/content/pm/PackageManager.java
View File

@@ -1315,6 +1315,13 @@ public abstract class PackageManager {
@SdkConstant(SdkConstantType.FEATURE) @SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_BACKUP = "android.software.backup"; 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. * Action to external storage service to clean out removed apps.
* @hide * @hide
@@ -2490,7 +2497,7 @@ public abstract class PackageManager {
/** /**
* Return the generic icon for an activity that is used when no specific * Return the generic icon for an activity that is used when no specific
* icon is defined. * icon is defined.
* *
* @return Drawable Image of the icon. * @return Drawable Image of the icon.
*/ */
public abstract Drawable getDefaultActivityIcon(); public abstract Drawable getDefaultActivityIcon();