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

Merge "Docs: DevicePolicyManager#getStorageEncryptionStatus() cannot be called on the parent instance" into tm-qpr-dev

Browse Source
This commit is contained in:
Pietro Maggi
2023-01-11 14:23:56 +00:00
committed by Android (Google) Code Review
parent aa1a59e631 4ec801cb12
commit 5796ecca29
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6787,6 +6787,8 @@ public class DevicePolicyManager {
* {@link #ENCRYPTION_STATUS_UNSUPPORTED}, {@link #ENCRYPTION_STATUS_INACTIVE}, * {@link #ENCRYPTION_STATUS_UNSUPPORTED}, {@link #ENCRYPTION_STATUS_INACTIVE},
* {@link #ENCRYPTION_STATUS_ACTIVATING}, {@link #ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY}, * {@link #ENCRYPTION_STATUS_ACTIVATING}, {@link #ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY},
* {@link #ENCRYPTION_STATUS_ACTIVE}, or {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER}. * {@link #ENCRYPTION_STATUS_ACTIVE}, or {@link #ENCRYPTION_STATUS_ACTIVE_PER_USER}.
*
* @throws SecurityException if called on a parent instance.
*/ */
public int getStorageEncryptionStatus() { public int getStorageEncryptionStatus() {
throwIfParentInstance("getStorageEncryptionStatus"); throwIfParentInstance("getStorageEncryptionStatus");