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

Commit 452efaac authored by Edman Anjos's avatar Edman Anjos Committed by Android (Google) Code Review
Browse files

Merge changes I50d2903e,Ieb347ce3 

* changes:
  Add DPMS delegation scopes.
  Add block uninstall delegation in DPMS.
parents 1597e054 52088e48

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6279,7 +6279,11 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";

    field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";

    field public static final java.lang.String DELEGATION_APP_RESTRICTIONS = "delegation-app-restrictions";

    field public static final java.lang.String DELEGATION_BLOCK_UNINSTALL = "delegation-block-uninstall";

    field public static final java.lang.String DELEGATION_CERT_INSTALL = "delegation-cert-install";

    field public static final java.lang.String DELEGATION_ENABLE_SYSTEM_APP = "delegation-enable-system-app";

    field public static final java.lang.String DELEGATION_PACKAGE_ACCESS = "delegation-package-access";

    field public static final java.lang.String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";

    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

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6497,7 +6497,11 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";

    field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";

    field public static final java.lang.String DELEGATION_APP_RESTRICTIONS = "delegation-app-restrictions";

    field public static final java.lang.String DELEGATION_BLOCK_UNINSTALL = "delegation-block-uninstall";

    field public static final java.lang.String DELEGATION_CERT_INSTALL = "delegation-cert-install";

    field public static final java.lang.String DELEGATION_ENABLE_SYSTEM_APP = "delegation-enable-system-app";

    field public static final java.lang.String DELEGATION_PACKAGE_ACCESS = "delegation-package-access";

    field public static final java.lang.String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";

    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

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6301,7 +6301,11 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";

    field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";

    field public static final java.lang.String DELEGATION_APP_RESTRICTIONS = "delegation-app-restrictions";

    field public static final java.lang.String DELEGATION_BLOCK_UNINSTALL = "delegation-block-uninstall";

    field public static final java.lang.String DELEGATION_CERT_INSTALL = "delegation-cert-install";

    field public static final java.lang.String DELEGATION_ENABLE_SYSTEM_APP = "delegation-enable-system-app";

    field public static final java.lang.String DELEGATION_PACKAGE_ACCESS = "delegation-package-access";

    field public static final java.lang.String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";

    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

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

+142 −48

File changed.

Preview size limit exceeded, changes collapsed.

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

+12 −12

File changed.

Preview size limit exceeded, changes collapsed.