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

Commit d4e25d49 authored by Eran Messeri's avatar Eran Messeri
Browse files

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
parent faa0e9db

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6841,7 +6841,7 @@ package android.app.admin { 
    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 @@ package android.app.admin { 
    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);

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

+9 −0
Original line number Diff line number Diff line
@@ -4653,6 +4653,9 @@ public class DevicePolicyManager { 
            | 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 @@ public class DevicePolicyManager {













     * @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 @@ public class DevicePolicyManager {













    }





























    /**













     * @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 @@ public class DevicePolicyManager {













     * 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) {