diff options
| author | Adam Connors <adamconnors@google.com> | 2014-04-04 14:40:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 14:40:20 +0000 |
| commit | d423986e68d76958441c3bec1584a86f7f390988 (patch) | |
| tree | 73b07a8490f3ab95a23e31af027199ec31b7c356 /api | |
| parent | e4c3dfa7b6ef3819c9c0599c8f301eb4de30f2c5 (diff) | |
| parent | 23cc04e598cfb1c7f10e3fab05b188a8738edb35 (diff) | |
| download | frameworks_base-d423986e68d76958441c3bec1584a86f7f390988.zip frameworks_base-d423986e68d76958441c3bec1584a86f7f390988.tar.gz frameworks_base-d423986e68d76958441c3bec1584a86f7f390988.tar.bz2 | |
Merge "Add android.software.managedprofiles feature flag."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 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"; |