From d57272d76bb847a219df194586b9b372bf9dd62e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 24 May 2022 23:12:44 +0000 Subject: [PATCH] Re-deprecate ENCRYPTION_STATUS_ACTIVATING As per more API council feedback, ENCRYPTION_STATUS_ACTIVATING should in fact be deprecated, given that it has never actually been used. Bug: 233801960 Change-Id: I6f8da12f291d1238008eb2d928547fda70ca9402 --- core/api/current.txt | 2 +- core/java/android/app/admin/DevicePolicyManager.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index d37f80671a6bc..31b0f057d4ea5 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 578e29090d13f..939763ac811db 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6490,8 +6490,10 @@ public class DevicePolicyManager { * Result code for {@link #getStorageEncryptionStatus}: indicating that encryption is not * currently active, but is currently being activated. *

- * 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; /**