Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove DELEGATION_PACKAGE_INSTALLATION" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-08 15:10:59 +00:00
committed by Android (Google) Code Review
parent 9dfc48d06e edeb2ffab3
commit e9d146ec9a
4 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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_KEEP_UNINSTALLED_PACKAGES = "delegation-keep-uninstalled-packages";
field public static final String DELEGATION_NETWORK_LOGGING = "delegation-network-logging"; 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_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 String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";
field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2 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 = 3; // 0x3

8
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -1730,14 +1730,6 @@ public class DevicePolicyManager {
*/ */
public static final String DELEGATION_CERT_SELECTION = "delegation-cert-selection"; 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. * No management for current user in-effect. This is the default.
* @hide * @hide

4
core/java/android/content/pm/PackageInstaller.java
View File

@@ -84,8 +84,6 @@ import java.util.concurrent.Executor;
* <ul> * <ul>
* <li>the device owner * <li>the device owner
* <li>the affiliated profile owner * <li>the affiliated profile owner
* <li>the device owner delegated app with
* {@link android.app.admin.DevicePolicyManager#DELEGATION_PACKAGE_INSTALLATION}
* </ul> * </ul>
* <p> * <p>
* Sessions can install brand new apps, upgrade existing apps, or add new splits * 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 current "installer of record" for the package
* <li>the device owner * <li>the device owner
* <li>the affiliated profile owner * <li>the affiliated profile owner
* <li>the device owner delegated app with
* {@link android.app.admin.DevicePolicyManager#DELEGATION_PACKAGE_INSTALLATION}
* </ul> * </ul>
* *
* @param packageName The package to uninstall. * @param packageName The package to uninstall.

7
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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_KEEP_UNINSTALLED_PACKAGES;
import static android.app.admin.DevicePolicyManager.DELEGATION_NETWORK_LOGGING; 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_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.DELEGATION_PERMISSION_GRANT;
import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO; import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO;
import static android.app.admin.DevicePolicyManager.ID_TYPE_IMEI; import static android.app.admin.DevicePolicyManager.ID_TYPE_IMEI;
@@ -379,13 +378,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
DELEGATION_KEEP_UNINSTALLED_PACKAGES, DELEGATION_KEEP_UNINSTALLED_PACKAGES,
DELEGATION_NETWORK_LOGGING, DELEGATION_NETWORK_LOGGING,
DELEGATION_CERT_SELECTION, DELEGATION_CERT_SELECTION,
DELEGATION_PACKAGE_INSTALLATION
}; };
// Subset of delegations that can only be delegated by Device Owner. // Subset of delegations that can only be delegated by Device Owner.
private static final List<String> DEVICE_OWNER_DELEGATIONS = Arrays.asList(new String[] { private static final List<String> DEVICE_OWNER_DELEGATIONS = Arrays.asList(new String[] {
DELEGATION_NETWORK_LOGGING, DELEGATION_NETWORK_LOGGING,
DELEGATION_PACKAGE_INSTALLATION
}); });
// Subset of delegations that only one single package within a given user can hold // 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 // device owner or a profile owner affiliated with the device owner
return true; return true;
} }
if (DevicePolicyManagerService.this.isCallerDelegate(callerPackage, callerUid,
DELEGATION_PACKAGE_INSTALLATION)) {
return true;
}
return false; return false;
} }