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

Commit 942c63cf authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Allow uninstalling DMRH when not used for management" into udc-dev am: 3666ab81 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29703207



Change-Id: I7174005081a5edc25617d1d0d44c3aef6045c25f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94e68686 3666ab81

services/core/java/com/android/server/pm/PackageManagerService.java

+24 −7
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ import android.app.ApplicationExitInfo; 
import android.app.ApplicationPackageManager;

import android.app.ApplicationPackageManager;

import android.app.BroadcastOptions;

import android.app.BroadcastOptions;

import android.app.IActivityManager;

import android.app.IActivityManager;

import android.app.admin.DevicePolicyManagerInternal;

import android.app.admin.IDevicePolicyManager;

import android.app.admin.IDevicePolicyManager;

import android.app.admin.SecurityLog;

import android.app.admin.SecurityLog;

import android.app.backup.IBackupManager;

import android.app.backup.IBackupManager;
@@ -3371,8 +3372,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
    // TODO(b/261957226): centralise this logic in DPM

    // TODO(b/261957226): centralise this logic in DPM

    boolean isPackageDeviceAdmin(String packageName, int userId) {

    boolean isPackageDeviceAdmin(String packageName, int userId) {

        final IDevicePolicyManager dpm = getDevicePolicyManager();

        final IDevicePolicyManager dpm = getDevicePolicyManager();

        final DevicePolicyManagerInternal dpmi =

                mInjector.getLocalService(DevicePolicyManagerInternal.class);

        try {

        try {

            if (dpm != null) {

            if (dpm != null && dpmi != null) {

                final ComponentName deviceOwnerComponentName = dpm.getDeviceOwnerComponent(

                final ComponentName deviceOwnerComponentName = dpm.getDeviceOwnerComponent(

                        /* callingUserOnly =*/ false);

                        /* callingUserOnly =*/ false);

                final String deviceOwnerPackageName = deviceOwnerComponentName == null ? null

                final String deviceOwnerPackageName = deviceOwnerComponentName == null ? null
@@ -3385,17 +3388,31 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                    return true;

                    return true;

                }

                }

                // Does it contain a device admin for any user?

                // Does it contain a device admin for any user?

                int[] users;

                int[] allUsers = mUserManager.getUserIds();

                int[] targetUsers;

                if (userId == UserHandle.USER_ALL) {

                if (userId == UserHandle.USER_ALL) {

                    users = mUserManager.getUserIds();

                    targetUsers = allUsers;

                } else {

                } else {

                    users = new int[]{userId};

                    targetUsers = new int[]{userId};

                }

                }

                for (int i = 0; i < users.length; ++i) {



                    if (dpm.packageHasActiveAdmins(packageName, users[i])) {

                for (int i = 0; i < targetUsers.length; ++i) {

                    if (dpm.packageHasActiveAdmins(packageName, targetUsers[i])) {

                        return true;

                        return true;

                    }

                    }

                    if (isDeviceManagementRoleHolder(packageName, users[i])) {

                }



                // If a package is DMRH on a managed user, it should also be treated as an admin on

                // that user. If that package is also a system package, it should also be protected

                // on other users otherwise "uninstall updates" on an unmanaged user may break

                // management on other users because apk version is shared between all users.

                var packageState = snapshotComputer().getPackageStateInternal(packageName);

                if (packageState == null) {

                    return false;

                }

                for (int user : packageState.isSystem() ? allUsers : targetUsers) {

                    if (isDeviceManagementRoleHolder(packageName, user)

                            && dpmi.isUserOrganizationManaged(user)) {

                        return true;

                        return true;

                    }

                    }

                }

                }