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

Commit edeb2ffa authored by Rubin Xu's avatar Rubin Xu
Browse files

Remove DELEGATION_PACKAGE_INSTALLATION 

Bug: 112982695
Test: atest MixedDeviceOwnerTest.testDelegation
Change-Id: I729f27e132e608e81d4971966743b3988e612ab5
parent 9ad8aa3a

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

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

+0 −8
Original line number Diff line number Diff line
@@ -1686,14 +1686,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

core/java/android/content/pm/PackageInstaller.java

+0 −4
Original line number Diff line number Diff line
@@ -80,8 +80,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
@@ -534,8 +532,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.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −7
Original line number Diff line number Diff line
@@ -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<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 @@ 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;















        }