Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d423986e authored by Adam Connors's avatar Adam Connors Committed by Android (Google) Code Review
Browse files

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

parents e4c3dfa7 23cc04e5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

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

+8 −1
Original line number Diff line number Diff line
@@ -1315,6 +1315,13 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    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