Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark storage encryption functions as deprecated."

Browse Source
This commit is contained in:
Eran Messeri
2020-01-22 10:25:12 +00:00
committed by Android (Google) Code Review
parent 6bf8baead4 d4e25d49b0
commit d0d2a86995
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -6859,7 +6859,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();
@@ -6993,7 +6993,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);

9
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -4660,6 +4660,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>
@@ -4693,6 +4696,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) {
@@ -4706,6 +4710,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.
*
@@ -4714,6 +4722,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) {