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

Commit c0e1258a authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Re-deprecate ENCRYPTION_STATUS_ACTIVATING"

parents a8b0f34f d57272d7

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7673,7 +7673,7 @@ package android.app.admin { 
    field public static final String DELEGATION_PACKAGE_ACCESS = "delegation-package-access";

    field public static final String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";

    field public static final String DELEGATION_SECURITY_LOGGING = "delegation-security-logging";

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

    field @Deprecated public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2

    field public static final int ENCRYPTION_STATUS_ACTIVE = 3; // 0x3

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

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

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

+3 −1
Original line number Diff line number Diff line
@@ -6490,8 +6490,10 @@ public class DevicePolicyManager { 
     * Result code for {@link #getStorageEncryptionStatus}: indicating that encryption is not

     * currently active, but is currently being activated.

     * <p>

     * This result code has never actually been used.

     * @deprecated This result code has never actually been used, so there is no reason for apps to

     * check for it.

     */

    @Deprecated

    public static final int ENCRYPTION_STATUS_ACTIVATING = 2;















    /**