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

Merge "Fix bug in userControlDisabledPackages on reboot" into udc-dev

Browse Source
This commit is contained in:
Kholoud Mohamed
2023-04-24 14:46:18 +00:00
committed by Android (Google) Code Review
parent a8b0dcfaef 3b366ef5f5
commit 0008bee5a3
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3575,7 +3575,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
void handleStartUser(int userId) { void handleStartUser(int userId) {
synchronized (getLockObject()) { synchronized (getLockObject()) {
pushScreenCapturePolicy(userId); pushScreenCapturePolicy(userId);
pushUserControlDisabledPackagesLocked(userId); if (!isPolicyEngineForFinanceFlagEnabled()) {
pushUserControlDisabledPackagesLocked(userId);
}
} }
pushUserRestrictions(userId); pushUserRestrictions(userId);
// When system user is started (device boot), load cache for all users. // When system user is started (device boot), load cache for all users.
@@ -10062,7 +10064,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
setNetworkLoggingActiveInternal(false); setNetworkLoggingActiveInternal(false);
deleteTransferOwnershipBundleLocked(userId); deleteTransferOwnershipBundleLocked(userId);
toggleBackupServiceActive(UserHandle.USER_SYSTEM, true); toggleBackupServiceActive(UserHandle.USER_SYSTEM, true);
pushUserControlDisabledPackagesLocked(userId); if (!isPolicyEngineForFinanceFlagEnabled()) {
pushUserControlDisabledPackagesLocked(userId);
}
setGlobalSettingDeviceOwnerType(DEVICE_OWNER_TYPE_DEFAULT); setGlobalSettingDeviceOwnerType(DEVICE_OWNER_TYPE_DEFAULT);
if (isPolicyEngineForFinanceFlagEnabled() || isPermissionCheckFlagEnabled()) { if (isPolicyEngineForFinanceFlagEnabled() || isPermissionCheckFlagEnabled()) {

16
services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java
View File

@@ -26,6 +26,7 @@ import android.app.admin.PackagePermissionPolicyKey;
import android.app.admin.PackagePolicyKey; import android.app.admin.PackagePolicyKey;
import android.app.admin.PolicyKey; import android.app.admin.PolicyKey;
import android.app.admin.UserRestrictionPolicyKey; import android.app.admin.UserRestrictionPolicyKey;
import android.app.usage.UsageStatsManagerInternal;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.IntentFilter; import android.content.IntentFilter;
@@ -38,6 +39,7 @@ import android.os.UserHandle;
import android.permission.AdminPermissionControlParams; import android.permission.AdminPermissionControlParams;
import android.permission.PermissionControllerManager; import android.permission.PermissionControllerManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.ArraySet;
import android.util.Slog; import android.util.Slog;
import com.android.server.LocalServices; import com.android.server.LocalServices;
@@ -151,11 +153,15 @@ final class PolicyEnforcerCallbacks {
static boolean setUserControlDisabledPackages( static boolean setUserControlDisabledPackages(
@Nullable Set<String> packages, int userId) { @Nullable Set<String> packages, int userId) {
Binder.withCleanCallingIdentity(() -> Binder.withCleanCallingIdentity(() -> {
LocalServices.getService(PackageManagerInternal.class) LocalServices.getService(PackageManagerInternal.class)
.setOwnerProtectedPackages( .setOwnerProtectedPackages(
userId, userId,
packages == null ? null : packages.stream().toList())); packages == null ? null : packages.stream().toList());
LocalServices.getService(UsageStatsManagerInternal.class)
.setAdminProtectedPackages(
packages == null ? null : new ArraySet(packages), userId);
});
return true; return true;
} }