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

Commit 746a795b authored by Neda Topoljanac's avatar Neda Topoljanac Committed by Android (Google) Code Review
Browse files

Merge "Add DevicePolicyManager constants for enterprise WiFi Provisioning with certificates"

parents e01c5446 0296597d

api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -6735,14 +6735,21 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

    field public static final java.lang.String EXTRA_PROVISIONING_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_ANONYMOUS_IDENTITY = "android.app.extra.PROVISIONING_WIFI_ANONYMOUS_IDENTITY";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_CA_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_CA_CERTIFICATE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_DOMAIN = "android.app.extra.PROVISIONING_WIFI_DOMAIN";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_EAP_METHOD = "android.app.extra.PROVISIONING_WIFI_EAP_METHOD";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_IDENTITY = "android.app.extra.PROVISIONING_WIFI_IDENTITY";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PASSWORD = "android.app.extra.PROVISIONING_WIFI_PASSWORD";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PHASE2_AUTH = "android.app.extra.PROVISIONING_WIFI_PHASE2_AUTH";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_HOST = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_USER_CERTIFICATE";

    field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1

    field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2

    field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1

core/java/android/app/admin/DevicePolicyManager.java

+101 −6
Original line number Diff line number Diff line
@@ -664,8 +664,8 @@ public class DevicePolicyManager { 


    /**

     * A String extra indicating the security type of the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID} and could be one of {@code NONE}, {@code WPA} or

     * {@code WEP}.

     * {@link #EXTRA_PROVISIONING_WIFI_SSID} and could be one of {@code NONE}, {@code WPA},

     * {@code WEP} or {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.
@@ -680,8 +680,89 @@ public class DevicePolicyManager { 
     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PASSWORD

        = "android.app.extra.PROVISIONING_WIFI_PASSWORD";

    public static final String EXTRA_PROVISIONING_WIFI_PASSWORD =

            "android.app.extra.PROVISIONING_WIFI_PASSWORD";



    /**

     * The EAP method of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}

     * and could be one of {@code PEAP}, {@code TLS}, {@code TTLS}, {@code PWD}, {@code SIM},

     * {@code AKA} or {@code AKA_PRIME}. This is only used if the

     * {@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_EAP_METHOD =

            "android.app.extra.PROVISIONING_WIFI_EAP_METHOD";



    /**

     * The phase 2 authentication of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}

     * and could be one of {@code NONE}, {@code PAP}, {@code MSCHAP}, {@code MSCHAPV2}, {@code GTC},

     * {@code SIM}, {@code AKA} or {@code AKA_PRIME}. This is only used if the

     * {@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PHASE2_AUTH =

            "android.app.extra.PROVISIONING_WIFI_PHASE2_AUTH";



    /**

     * The CA certificate of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}. This should

     * be an X.509 certificate Base64 encoded DER format, ie. PEM representation of a certificate

     * without header, footer and line breaks. <a href=

     * "https://tools.ietf.org/html/rfc7468"> More information</a> This is only

     * used if the {@link

     * #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_CA_CERTIFICATE =

            "android.app.extra.PROVISIONING_WIFI_CA_CERTIFICATE";



    /**

     * The user certificate of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}. This

     * should be an X.509 certificate and private key Base64 encoded DER format, ie. PEM

     * representation of a certificate and key without header, footer and line breaks. <a href=

     * "https://tools.ietf.org/html/rfc7468"> More information</a> This is only

     * used if the {@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE =

            "android.app.extra.PROVISIONING_WIFI_USER_CERTIFICATE";



    /**

     * The identity of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}. This is only used

     * if the {@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_IDENTITY =

            "android.app.extra.PROVISIONING_WIFI_IDENTITY";



    /**

     * The anonymous identity of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}. This is

     * only used if the {@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */



    public static final String EXTRA_PROVISIONING_WIFI_ANONYMOUS_IDENTITY =

            "android.app.extra.PROVISIONING_WIFI_ANONYMOUS_IDENTITY";

    /**

     * The domain of the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}. This is only used if

     * the {@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE} is {@code EAP}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_DOMAIN =

            "android.app.extra.PROVISIONING_WIFI_DOMAIN";



    /**

     * A String extra holding the proxy host for the wifi network in
@@ -1067,8 +1148,22 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_PORT} (convert to String), optional</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_BYPASS}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PAC_URL}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional, supported from

     * {@link android.os.Build.VERSION_CODES#M} </li></ul>

     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#M} </li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_EAP_METHOD}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PHASE2_AUTH}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_CA_CERTIFICATE}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_IDENTITY}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_ANONYMOUS_IDENTITY}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_DOMAIN}, optional, supported from {@link

     * android.os.Build.VERSION_CODES#Q}</li></ul>

     *

     * <p>

     * As of {@link android.os.Build.VERSION_CODES#M}, the properties should contain