Mark storage encryption functions as deprecated.
The setStorageEncryption/getStorageEncryption methods do nothing and
never have they had any impact on the system.
All setStorageEncryption does is store a value that can be retrieved by
getStorageEncryption. Otherwise, it calls setEncryptionRequested
internally which has an empty body.
Mark them as deprecated so they could be removed in the future.
Test: that it compiles
Bug: 144412716
Change-Id: I007a1acf80ddb7cba9717f2e541f029c5f379d11
diff --git a/api/current.txt b/api/current.txt
index d8fac42..0f17800 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6841,7 +6841,7 @@
method public java.util.List<android.os.UserHandle> getSecondaryUsers(@NonNull android.content.ComponentName);
method public CharSequence getShortSupportMessage(@NonNull android.content.ComponentName);
method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);
- method public boolean getStorageEncryption(@Nullable android.content.ComponentName);
+ method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);
method public int getStorageEncryptionStatus();
method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();
@@ -6972,7 +6972,7 @@
method public void setShortSupportMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);
method public void setStartUserSessionMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);
method public boolean setStatusBarDisabled(@NonNull android.content.ComponentName, boolean);
- method public int setStorageEncryption(@NonNull android.content.ComponentName, boolean);
+ method @Deprecated public int setStorageEncryption(@NonNull android.content.ComponentName, boolean);
method public void setSystemSetting(@NonNull android.content.ComponentName, @NonNull String, String);
method public void setSystemUpdatePolicy(@NonNull android.content.ComponentName, android.app.admin.SystemUpdatePolicy);
method public boolean setTime(@NonNull android.content.ComponentName, long);
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 54a64ef..4c62626 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -4653,6 +4653,9 @@
| DevicePolicyManager.KEYGUARD_DISABLE_BIOMETRICS;
/**
+ * @deprecated This method does not actually modify the storage encryption of the device.
+ * It has never affected the encryption status of a device.
+ *
* Called by an application that is administering the device to request that the storage system
* be encrypted. Does nothing if the caller is on a secondary user or a managed profile.
* <p>
@@ -4686,6 +4689,7 @@
* @throws SecurityException if {@code admin} is not an active administrator or does not use
* {@link DeviceAdminInfo#USES_ENCRYPTED_STORAGE}
*/
+ @Deprecated
public int setStorageEncryption(@NonNull ComponentName admin, boolean encrypt) {
throwIfParentInstance("setStorageEncryption");
if (mService != null) {
@@ -4699,6 +4703,10 @@
}
/**
+ * @deprecated This method only returns the value set by {@link #setStorageEncryption}.
+ * It does not actually reflect the storage encryption status.
+ * Use {@link #getStorageEncryptionStatus} for that.
+ *
* Called by an application that is administering the device to
* determine the requested setting for secure storage.
*
@@ -4707,6 +4715,7 @@
* administrators.
* @return true if the admin(s) are requesting encryption, false if not.
*/
+ @Deprecated
public boolean getStorageEncryption(@Nullable ComponentName admin) {
throwIfParentInstance("getStorageEncryption");
if (mService != null) {