diff --git a/api/current.txt b/api/current.txt index 561a20b9882da..5997043cdd4ab 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6836,7 +6836,6 @@ package android.app.admin { field public static final String DELEGATION_KEEP_UNINSTALLED_PACKAGES = "delegation-keep-uninstalled-packages"; field public static final String DELEGATION_NETWORK_LOGGING = "delegation-network-logging"; field public static final String DELEGATION_PACKAGE_ACCESS = "delegation-package-access"; - field public static final String DELEGATION_PACKAGE_INSTALLATION = "delegation-package-installation"; field public static final 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 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index fb4eb5ae4fdd9..3f7b29109b3dc 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1730,14 +1730,6 @@ public class DevicePolicyManager { */ public static final String DELEGATION_CERT_SELECTION = "delegation-cert-selection"; - - /** - * Delegation of silent APK installation via {@link android.content.pm.PackageInstaller} APIs. - * - *

Can only be delegated by Device Owner. - */ - public static final String DELEGATION_PACKAGE_INSTALLATION = "delegation-package-installation"; - /** * No management for current user in-effect. This is the default. * @hide diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 90fb20bb0163b..7fe840c11dfa4 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -84,8 +84,6 @@ import java.util.concurrent.Executor; *

*

* Sessions can install brand new apps, upgrade existing apps, or add new splits @@ -538,8 +536,6 @@ public class PackageInstaller { *

  • the current "installer of record" for the package *
  • the device owner *
  • the affiliated profile owner - *
  • the device owner delegated app with - * {@link android.app.admin.DevicePolicyManager#DELEGATION_PACKAGE_INSTALLATION} * * * @param packageName The package to uninstall. diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index d014c0a347559..8f2a2d2dae67d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -47,7 +47,6 @@ import static android.app.admin.DevicePolicyManager.DELEGATION_INSTALL_EXISTING_ import static android.app.admin.DevicePolicyManager.DELEGATION_KEEP_UNINSTALLED_PACKAGES; import static android.app.admin.DevicePolicyManager.DELEGATION_NETWORK_LOGGING; import static android.app.admin.DevicePolicyManager.DELEGATION_PACKAGE_ACCESS; -import static android.app.admin.DevicePolicyManager.DELEGATION_PACKAGE_INSTALLATION; import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT; import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO; import static android.app.admin.DevicePolicyManager.ID_TYPE_IMEI; @@ -379,13 +378,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { DELEGATION_KEEP_UNINSTALLED_PACKAGES, DELEGATION_NETWORK_LOGGING, DELEGATION_CERT_SELECTION, - DELEGATION_PACKAGE_INSTALLATION }; // Subset of delegations that can only be delegated by Device Owner. private static final List DEVICE_OWNER_DELEGATIONS = Arrays.asList(new String[] { DELEGATION_NETWORK_LOGGING, - DELEGATION_PACKAGE_INSTALLATION }); // Subset of delegations that only one single package within a given user can hold @@ -11271,10 +11268,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { // device owner or a profile owner affiliated with the device owner return true; } - if (DevicePolicyManagerService.this.isCallerDelegate(callerPackage, callerUid, - DELEGATION_PACKAGE_INSTALLATION)) { - return true; - } return false; }