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

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

Merge changes Ia5112416,I16b8c152 

* changes:
  Revert deprecation of DevicePolicyManager FDE constants
  Revert deprecation of Telephony FDE constant
parents 4ccf3e4c 9a3cf7c7

core/api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -7673,11 +7673,11 @@ 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 @Deprecated public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2

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

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

    field 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

    field @Deprecated public static final int ENCRYPTION_STATUS_INACTIVE = 1; // 0x1

    field public static final int ENCRYPTION_STATUS_INACTIVE = 1; // 0x1

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

    field public static final String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";

    field public static final String EXTRA_DELEGATION_SCOPES = "android.app.extra.DELEGATION_SCOPES";
@@ -36148,7 +36148,7 @@ package android.provider { 
    field public static final int RESULT_SMS_NULL_MESSAGE = 8; // 0x8

    field public static final int RESULT_SMS_NULL_PDU = 7; // 0x7

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

    field @Deprecated public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9; // 0x9

    field public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9; // 0x9

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

    field @Deprecated public static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";

    field public static final String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";

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

+27 −30
Original line number Diff line number Diff line
@@ -6473,53 +6473,50 @@ public class DevicePolicyManager { 
    public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0;















    /**













     * @deprecated {@link #getStorageEncryptionStatus} could only return this value on devices that













     * use Full Disk Encryption.  However, support for Full Disk Encryption was entirely removed in













     * API level 33, being replaced by File Based Encryption.  {@link #setStorageEncryption} can













     * return this value for an unrelated reason, but {@link #setStorageEncryption} is deprecated













     * since it doesn't do anything useful.













     *















     * Result code for {@link #setStorageEncryption} and {@link #getStorageEncryptionStatus}:















     * indicating that encryption is supported, but is not currently active.













     * <p>













     * {@link #getStorageEncryptionStatus} can only return this value on devices that use Full Disk













     * Encryption.  Support for Full Disk Encryption was entirely removed in API level 33, having













     * been replaced by File Based Encryption.  Devices that use File Based Encryption always













     * automatically activate their encryption on first boot.













     * <p>













     * {@link #setStorageEncryption} can still return this value for an unrelated reason, but {@link













     * #setStorageEncryption} is deprecated since it doesn't do anything useful.















     */















    public static final int ENCRYPTION_STATUS_INACTIVE = 1;





























    /**













     * @deprecated {@link #getStorageEncryptionStatus} could only return this value on devices that













     * use Full Disk Encryption.  However, support for Full Disk Encryption was entirely removed in













     * API level 33, being replaced by File Based Encryption.













     *













     * Result code for {@link #getStorageEncryptionStatus}:













     * indicating that encryption is not currently active, but is currently













     * being activated.  This is only reported by devices that support













     * encryption of data and only when the storage is currently













     * undergoing a process of becoming encrypted.  A device that must reboot and/or wipe data













     * to become encrypted will never return this value.













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















     */















    public static final int ENCRYPTION_STATUS_ACTIVATING = 2;





























    /**













     * @deprecated {@link #getStorageEncryptionStatus} could only return this value for apps













     * targeting API level 23 or lower, or on devices that use Full Disk Encryption.  However,













     * support for Full Disk Encryption was entirely removed in API level 33, being replaced by File













     * Based Encryption.  {@link #setStorageEncryption} can return this value for an unrelated













     * reason, but {@link #setStorageEncryption} is deprecated since it doesn't do anything useful.













     *















     * Result code for {@link #setStorageEncryption} and {@link #getStorageEncryptionStatus}:















     * indicating that encryption is active.















     * <p>













     * Also see {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER}.













     * {@link #getStorageEncryptionStatus} can only return this value for apps targeting API level













     * 23 or lower, or on devices that use Full Disk Encryption.  Support for Full Disk Encryption













     * was entirely removed in API level 33, having been replaced by File Based Encryption.  The













     * result code {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER} is used on devices that use File Based













     * Encryption, except when the app targets API level 23 or lower.













     * <p>













     * {@link #setStorageEncryption} can still return this value for an unrelated reason, but {@link













     * #setStorageEncryption} is deprecated since it doesn't do anything useful.















     */















    public static final int ENCRYPTION_STATUS_ACTIVE = 3;





























    /**













     * @deprecated {@link #getStorageEncryptionStatus} could only return this value on devices that













     * use Full Disk Encryption.  However, support for Full Disk Encryption was entirely removed in













     * API level 33, being replaced by File Based Encryption.













     *













     * Result code for {@link #getStorageEncryptionStatus}:













     * indicating that encryption is active, but an encryption key has not













     * been set by the user.













     * Result code for {@link #getStorageEncryptionStatus}: indicating that encryption is active,













     * but the encryption key is not cryptographically protected by the user's credentials.













     * <p>













     * This value can only be returned on devices that use Full Disk Encryption.  Support for Full













     * Disk Encryption was entirely removed in API level 33, having been replaced by File Based













     * Encryption.  With File Based Encryption, each user's credential-encrypted storage is always













     * cryptographically protected by the user's credentials.















     */















    public static final int ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY = 4;















































core/java/android/provider/Telephony.java



+4
−5






























Original line number
Diff line number
Diff line








@@ -930,12 +930,11 @@ public final class Telephony {













            /**















             * Set as a "result" extra in the {@link #SMS_REJECTED_ACTION} intent to indicate an sms















             * was received while the phone was in encrypted state.













             *













             * @deprecated This result is never used on devices that launched with Android 10 (API













             * level 29) or higher, since Android's storage encryption implementation has changed













             * and it no longer can cause the rejection of incoming SMS messages.













             * <p>













             * This result is never used on devices that launched with Android 10 (API level 29) or













             * higher, since Android's storage encryption implementation has changed and it no













             * longer can cause the rejection of incoming SMS messages.















             */













            @Deprecated















            public static final int RESULT_SMS_RECEIVED_WHILE_ENCRYPTED = 9;































            /**