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

Commit c070a099 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Add ENCRYPTION_STATUS_ACTIVE_PER_USER to..." into nyc-dev

parents b4cab0bd d4c9e541

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5979,6 +5979,7 @@ package android.app.admin { 
    field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2

    field public static final int ENCRYPTION_STATUS_ACTIVE = 3; // 0x3

    field public static final int ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY = 4; // 0x4

    field public static final int ENCRYPTION_STATUS_ACTIVE_PER_USER = 5; // 0x5

    field public static final int ENCRYPTION_STATUS_INACTIVE = 1; // 0x1

    field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0

    field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6130,6 +6130,7 @@ package android.app.admin { 
    field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2

    field public static final int ENCRYPTION_STATUS_ACTIVE = 3; // 0x3

    field public static final int ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY = 4; // 0x4

    field public static final int ENCRYPTION_STATUS_ACTIVE_PER_USER = 5; // 0x5

    field public static final int ENCRYPTION_STATUS_INACTIVE = 1; // 0x1

    field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0

    field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5983,6 +5983,7 @@ package android.app.admin { 
    field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2

    field public static final int ENCRYPTION_STATUS_ACTIVE = 3; // 0x3

    field public static final int ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY = 4; // 0x4

    field public static final int ENCRYPTION_STATUS_ACTIVE_PER_USER = 5; // 0x5

    field public static final int ENCRYPTION_STATUS_INACTIVE = 1; // 0x1

    field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0

    field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";

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

+7 −1
Original line number Diff line number Diff line
@@ -2486,6 +2486,12 @@ public class DevicePolicyManager { 
     */

    public static final int ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY = 4;



    /**

     * Result code for {@link #getStorageEncryptionStatus}:

     * indicating that encryption is active and the encryption key is tied to the user.

     */

    public static final int ENCRYPTION_STATUS_ACTIVE_PER_USER = 5;



    /**

     * Activity action: begin the process of encrypting data on the device.  This activity should

     * be launched after using {@link #setStorageEncryption} to request encryption be activated.
@@ -2627,7 +2633,7 @@ public class DevicePolicyManager { 
    public int getStorageEncryptionStatus(int userHandle) {

        if (mService != null) {

            try {

                return mService.getStorageEncryptionStatus(userHandle);

                return mService.getStorageEncryptionStatus(mContext.getPackageName(), userHandle);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ interface IDevicePolicyManager { 


    int setStorageEncryption(in ComponentName who, boolean encrypt);

    boolean getStorageEncryption(in ComponentName who, int userHandle);

    int getStorageEncryptionStatus(int userHandle);

    int getStorageEncryptionStatus(in String callerPackage, int userHandle);



    boolean requestBugreport(in ComponentName who);