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

Commit 5796ecca authored by Pietro Maggi's avatar Pietro Maggi Committed by Android (Google) Code Review
Browse files

Merge "Docs: DevicePolicyManager#getStorageEncryptionStatus() cannot be called... 

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

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -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");