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

Commit 292f3ad9 authored by Sander Alewijnse's avatar Sander Alewijnse Committed by Android Git Automerger
Browse files

am 476e3c39: am 0af82f65: am 0925db87: Merge "Rename the... 

am 476e3c39: am 0af82f65: am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev

* commit '476e3c39':
  Rename the dont_disable_system_apps constant.
parents 77bb6e67 476e3c39

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5403,8 +5403,8 @@ 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_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";

    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";

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

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

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ 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_DONT_DISABLE_SYSTEM_APPS =

            "android.app.extra.PROVISIONING_DONT_DISABLE_SYSTEM_APPS";

    public static final String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED =

            "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";



    /**

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