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

Commit c0fe93b3 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Add API constants for metadata for mainline modules" into sc-dev am: 25ba2e7f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13984191

Change-Id: I0004e68dd8261d48114414758ec266077ccbcb4f
parents 7a375195 25ba2e7f

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -951,6 +951,9 @@ package android.app.admin { 
    field @Deprecated public static final int PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER = 3; // 0x3

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

    field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0

    field public static final String REQUIRED_APP_MANAGED_DEVICE = "android.app.REQUIRED_APP_MANAGED_DEVICE";

    field public static final String REQUIRED_APP_MANAGED_PROFILE = "android.app.REQUIRED_APP_MANAGED_PROFILE";

    field public static final String REQUIRED_APP_MANAGED_USER = "android.app.REQUIRED_APP_MANAGED_USER";

    field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4

    field public static final int STATE_USER_PROFILE_FINALIZED = 5; // 0x5

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

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

+35 −0
Original line number Diff line number Diff line
@@ -3305,6 +3305,41 @@ public class DevicePolicyManager { 
    public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED =

            "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";













    /**













     * A {@code boolean} metadata to be included in a mainline module's {@code <application>}













     * manifest element, which declares that the module should be considered a required app for













     * managed users.













     * <p>Being declared as a required app prevents removal of this package during the













     * provisioning process.













     * @hide













     */













    @SystemApi













    public static final String REQUIRED_APP_MANAGED_USER = "android.app.REQUIRED_APP_MANAGED_USER";

























    /**













     * A {@code boolean} metadata to be included in a mainline module's {@code <application>}













     * manifest element, which declares that the module should be considered a required app for













     * managed devices.













     * <p>Being declared as a required app prevents removal of this package during the













     * provisioning process.













     * @hide













     */













    @SystemApi













    public static final String REQUIRED_APP_MANAGED_DEVICE =













            "android.app.REQUIRED_APP_MANAGED_DEVICE";

























    /**













     * A {@code boolean} metadata to be included in a mainline module's {@code <application>}













     * manifest element, which declares that the module should be considered a required app for













     * managed profiles.













     * <p>Being declared as a required app prevents removal of this package during the













     * provisioning process.













     * @hide













     */













    @SystemApi













    public static final String REQUIRED_APP_MANAGED_PROFILE =













            "android.app.REQUIRED_APP_MANAGED_PROFILE";



























    /**















     * Called by an application that is administering the device to set the password restrictions it















     * is imposing. After setting this, the user will not be able to enter a new password that is