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

Commit f39cec0b authored by Sander Alewijnse's avatar Sander Alewijnse Committed by Android (Google) Code Review
Browse files

Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev

parents 437d02d3 8c411561

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5402,6 +5402,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME";

    field public static final java.lang.String EXTRA_PROVISIONING_DONT_DISABLE_SYSTEM_APPS = "android.app.extra.PROVISIONING_DONT_DISABLE_SYSTEM_APPS";

    field public static final java.lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";

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

+42 −32
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ public class DevicePolicyManager { 
     * {@link #ACTION_PROVISION_MANAGED_PROFILE} this package has to match the package name of the

     * application that started provisioning. The package will be set as profile owner in that case.

     *

     * <p>This package is set as device owner when device owner provisioning is started by an Nfc

     * message containing an Nfc record with MIME type {@link #MIME_TYPE_PROVISIONING_NFC}.

     * <p>This package is set as device owner when device owner provisioning is started by an NFC

     * message containing an NFC record with MIME type {@link #MIME_TYPE_PROVISIONING_NFC}.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME";
@@ -175,12 +175,22 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_EMAIL_ADDRESS

        = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";



    /**

     * A Boolean extra that can be used by the mobile device management application to skip the

     * disabling of system apps during provisioning when set to <code>true</code>.

     *

     * <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_DONT_DISABLE_SYSTEM_APPS =

            "android.app.extra.PROVISIONING_DONT_DISABLE_SYSTEM_APPS";



    /**

     * A String extra holding the time zone {@link android.app.AlarmManager} that the device

     * will be set to.

     *

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

     * provisioning via an Nfc bump.

     * <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_TIME_ZONE

        = "android.app.extra.PROVISIONING_TIME_ZONE";
@@ -189,8 +199,8 @@ public class DevicePolicyManager { 
     * A Long extra holding the wall clock time (in milliseconds) to be set on the device's

     * {@link android.app.AlarmManager}.

     *

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

     * provisioning via an Nfc bump.

     * <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_LOCAL_TIME

        = "android.app.extra.PROVISIONING_LOCAL_TIME";
@@ -199,8 +209,8 @@ public class DevicePolicyManager { 
     * A String extra holding the {@link java.util.Locale} that the device will be set to.

     * Format: xx_yy, where xx is the language code, and yy the country code.

     *

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

     * provisioning via an Nfc bump.

     * <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_LOCALE

        = "android.app.extra.PROVISIONING_LOCALE";
@@ -209,8 +219,8 @@ public class DevicePolicyManager { 
     * A String extra holding the ssid of the wifi network that should be used during nfc device

     * owner provisioning for downloading the mobile device management application.

     *

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

     * provisioning via an Nfc bump.

     * <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_SSID

        = "android.app.extra.PROVISIONING_WIFI_SSID";
@@ -219,8 +229,8 @@ public class DevicePolicyManager { 
     * A boolean extra indicating whether the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}

     * is hidden or not.

     *

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

     * provisioning via an Nfc bump.

     * <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_HIDDEN

        = "android.app.extra.PROVISIONING_WIFI_HIDDEN";
@@ -229,8 +239,8 @@ public class DevicePolicyManager { 
     * A String extra indicating the security type of the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an Nfc bump.

     * <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_SECURITY_TYPE

        = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";
@@ -239,8 +249,8 @@ public class DevicePolicyManager { 
     * A String extra holding the password of the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an Nfc bump.

     * <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";
@@ -249,8 +259,8 @@ public class DevicePolicyManager { 
     * A String extra holding the proxy host for the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an Nfc bump.

     * <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_PROXY_HOST

        = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";
@@ -259,8 +269,8 @@ public class DevicePolicyManager { 
     * An int extra holding the proxy port for the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an Nfc bump.

     * <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_PROXY_PORT

        = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";
@@ -269,8 +279,8 @@ public class DevicePolicyManager { 
     * A String extra holding the proxy bypass for the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an Nfc bump.

     * <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_PROXY_BYPASS

        = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";
@@ -279,8 +289,8 @@ public class DevicePolicyManager { 
     * A String extra holding the proxy auto-config (PAC) URL for the wifi network in

     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an Nfc bump.

     * <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_PAC_URL

        = "android.app.extra.PROVISIONING_WIFI_PAC_URL";
@@ -289,8 +299,8 @@ public class DevicePolicyManager { 
     * A String extra holding a url that specifies the download location of the device admin

     * package. When not provided it is assumed that the device admin package is already installed.

     *

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

     * provisioning via an Nfc bump.

     * <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_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";
@@ -299,8 +309,8 @@ public class DevicePolicyManager { 
     * A String extra holding a http cookie header which should be used in the http request to the

     * url specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}.

     *

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

     * provisioning via an Nfc bump.

     * <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_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";
@@ -311,8 +321,8 @@ public class DevicePolicyManager { 
     * the file at the download location an error will be shown to the user and the user will be

     * asked to factory reset the device.

     *

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

     * provisioning via an Nfc bump.

     * <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_DEVICE_ADMIN_PACKAGE_CHECKSUM

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";
@@ -328,9 +338,9 @@ public class DevicePolicyManager { 
     * <p> A typical use case would be a device that is owned by a company, but used by either an

     * employee or client.

     *

     * <p> The Nfc message should be send to an unprovisioned device.

     * <p> The NFC message should be send to an unprovisioned device.

     *

     * <p>The Nfc record must contain a serialized {@link java.util.Properties} object which

     * <p>The NFC record must contain a serialized {@link java.util.Properties} object which

     * contains the following properties:

     * <ul>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}</li>