summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-08 15:10:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-08 15:10:59 +0000
commite9d146ec9acd932f906d68cf836bb162bde7f7ab (patch)
tree0f2afd2cdd957e0b917eae45a48f9599660002fe /core/java
parent9dfc48d06e0156c52df748ff64aa3bd2e09cd211 (diff)
parentedeb2ffab3899542c537c4145cbd41f15fb932bd (diff)
Merge "Remove DELEGATION_PACKAGE_INSTALLATION" into qt-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java8
-rw-r--r--core/java/android/content/pm/PackageInstaller.java4
2 files changed, 0 insertions, 12 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index fb4eb5ae4fdd..3f7b29109b3d 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.
- *
- * <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 90fb20bb0163..7fe840c11dfa 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;
* <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
@@ -538,8 +536,6 @@ public class PackageInstaller {
* <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.