Remove DELEGATION_PACKAGE_INSTALLATION
Bug: 112982695
Test: atest MixedDeviceOwnerTest.testDelegation
Change-Id: I729f27e132e608e81d4971966743b3988e612ab5
diff --git a/api/current.txt b/api/current.txt
index f78dfde..07b751e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6836,7 +6836,6 @@
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 83c5e20..c110b4c 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1686,14 +1686,6 @@
*/
public static final String DELEGATION_CERT_SELECTION = "delegation-cert-selection";
-
- /**
- * Delegation of silent APK installation via {@link android.content.pm.PackageInstaller} APIs.
- *
- * <p> 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 ec2e8ca..46e7694 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -80,8 +80,6 @@
* <ul>
* <li>the device owner
* <li>the affiliated profile owner
- * <li>the device owner delegated app with
- * {@link android.app.admin.DevicePolicyManager#DELEGATION_PACKAGE_INSTALLATION}
* </ul>
* <p>
* Sessions can install brand new apps, upgrade existing apps, or add new splits
@@ -534,8 +532,6 @@
* <li>the current "installer of record" for the package
* <li>the device owner
* <li>the affiliated profile owner
- * <li>the device owner delegated app with
- * {@link android.app.admin.DevicePolicyManager#DELEGATION_PACKAGE_INSTALLATION}
* </ul>
*
* @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 d014c0a..8f2a2d2 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_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 @@
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<String> 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 @@
// 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;
}