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

Commit ce81c8f0 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Minor bug fixes related to package/dpc removal 

Bug: 277749962
Test: a.d.c.AccountManagementTest#setAccountManagementDisabled_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.AccountManagementTest#setAccountManagementDisabled_setByPermission_appRemoved_notEnforced
Test: a.d.c.ApplicationHiddenTest#setApplicationHidden_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.ApplicationHiddenTest#setApplicationHidden_setByPermission_appRemoved_notEnforced
Test: a.d.c.BlockUninstallTest#setUninstallBlocked_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.BlockUninstallTest#setUninstallBlocked_setByPermission_appRemoved_notEnforced
Test: a.d.c.LockTaskTest#setLockTaskPackages_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.LockTaskTest#setLockTaskPackages_setByPermission_appRemoved_notEnforced
Test: a.d.c.PersistentPreferredActivitiesTest#addPersistentPreferredActivity_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.PersistentPreferredActivitiesTest#addPersistentPreferredActivity_setByPermission_appRemoved_notEnforced
Test: a.d.c.ScreenCaptureDisabledTest#setScreenCaptureDisabled_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.UserRestrictionsTest#addUserRestriction_setByDPCAndPermission_DPCRemoved_stillEnforced
Test: a.d.c.UserRestrictionsTest#addUserRestriction_setByPermission_appRemoved_notEnforced
Test: a.d.c.DeviceManagementCoexistenceTest#multiplePoliciesSet_dpcRemoved_removesPolicies
Change-Id: I103598be772376d629a40598631aafb474c56495
parent 6676adcd

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

+37 −10
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.content.pm.UserProperties.INHERIT_DEVICE_POLICY_FROM_PAREN 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.AppGlobals;

import android.app.BroadcastOptions;

import android.app.admin.DevicePolicyIdentifiers;

import android.app.admin.DevicePolicyManager;
@@ -45,6 +46,7 @@ import android.content.pm.UserProperties; 
import android.os.Binder;

import android.os.Bundle;

import android.os.Environment;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.telephony.TelephonyManager;
@@ -56,6 +58,7 @@ import android.util.Xml; 
import com.android.internal.util.XmlUtils;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.utils.Slogf;



import libcore.io.IoUtils;
@@ -1014,21 +1017,45 @@ final class DevicePolicyEngine { 
    /**

     * Handles internal state related to packages getting updated.

     */

    void handlePackageChanged(@Nullable String updatedPackage, int userId, boolean packageRemoved) {

        if (updatedPackage == null) {

    void handlePackageChanged(

            @Nullable String updatedPackage, int userId, @Nullable String removedDpcPackage) {

        Binder.withCleanCallingIdentity(() -> {

            Set<EnforcingAdmin> admins = getEnforcingAdminsOnUser(userId);

            if (removedDpcPackage != null) {

                for (EnforcingAdmin admin : admins) {

                    if (removedDpcPackage.equals(admin.getPackageName())) {

                        removePoliciesForAdmin(admin);

                        return;

                    }

        if (packageRemoved) {

            Set<EnforcingAdmin> admins = getEnforcingAdminsOnUser(userId);

                }

            }

            for (EnforcingAdmin admin : admins) {

                if (admin.getPackageName().equals(updatedPackage)) {

                if (updatedPackage == null || updatedPackage.equals(admin.getPackageName())) {

                    if (!isPackageInstalled(admin.getPackageName(), userId)) {

                        Slogf.i(TAG, String.format(

                                "Admin package %s not found for user %d, removing admin policies",

                                admin.getPackageName(), userId));

                        // remove policies for the uninstalled package

                        removePoliciesForAdmin(admin);

                        return;

                    }

                }

        } else {

            }

            if (updatedPackage != null) {

                updateDeviceAdminServiceOnPackageChanged(updatedPackage, userId);

            }

        });

    }



    private boolean isPackageInstalled(String packageName, int userId) {

        try {

            return AppGlobals.getPackageManager().getPackageInfo(

                    packageName, 0, userId) != null;

        } catch (RemoteException re) {

            // Shouldn't happen.

            Slogf.wtf(TAG, "Error handling package changes", re);

            return true;

        }

    }



    /**

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

+10 −4
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ import android.util.AtomicFile; 
import android.util.DebugUtils;

import android.util.IndentingPrintWriter;

import android.util.IntArray;

import android.util.Log;

import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;
@@ -1395,6 +1394,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 














    private void handlePackagesChanged(@Nullable String packageName, int userHandle) {















        boolean removedAdmin = false;













        String removedAdminPackage = null;















        if (VERBOSE_LOG) {















            Slogf.d(LOG_TAG, "Handling package changes package " + packageName















                    + " for user " + userHandle);









@@ -1417,6 +1417,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                                    "Admin package %s not found for user %d, removing active admin",















                                    packageName, userHandle));















                            removedAdmin = true;













                            removedAdminPackage = adminPackage;















                            policy.mAdminList.remove(i);















                            policy.mAdminMap.remove(aa.info.getComponent());















                            pushActiveAdminPackagesLocked(userHandle);










@@ -1450,7 +1451,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                startOwnerService(userHandle, "package-broadcast");















            }















            if (isPolicyEngineForFinanceFlagEnabled() || isPermissionCheckFlagEnabled()) {













                mDevicePolicyEngine.handlePackageChanged(packageName, userHandle, removedAdmin);













                mDevicePolicyEngine.handlePackageChanged(













                        packageName, userHandle, removedAdminPackage);















            }















            // Persist updates if the removed package was an admin or delegate.















            if (removedAdmin || removedDelegate) {










@@ -3549,8 +3551,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













            deleteTransferOwnershipBundleLocked(metadata.userId);















        }















        updateSystemUpdateFreezePeriodsRecord(/* saveIfChanged */ true);













        if (!isPolicyEngineForFinanceFlagEnabled()) {















            pushUserControlDisabledPackagesLocked(metadata.userId);















        }













    }





























    private void maybeLogStart() {















        if (!SecurityLog.isLoggingEnabled()) {










@@ -10111,7 +10115,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        clearUserPoliciesLocked(userId);















        clearOverrideApnUnchecked();















        clearApplicationRestrictions(userId);













        if (!isPolicyEngineForFinanceFlagEnabled()) {















            mInjector.getPackageManagerInternal().clearBlockUninstallForUser(userId);













        }





























        mOwners.clearDeviceOwner();















        mOwners.writeDeviceOwner();