diff options
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManagerInternal.java | 5 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 32 |
2 files changed, 0 insertions, 37 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManagerInternal.java b/core/java/android/app/admin/DevicePolicyManagerInternal.java index 1aee9fe57466..a9f2d74eae39 100644 --- a/core/java/android/app/admin/DevicePolicyManagerInternal.java +++ b/core/java/android/app/admin/DevicePolicyManagerInternal.java @@ -317,11 +317,6 @@ public abstract class DevicePolicyManagerInternal { public abstract boolean isUserOrganizationManaged(@UserIdInt int userId); /** - * Returns whether the application exemptions feature flag is enabled. - */ - public abstract boolean isApplicationExemptionsFlagEnabled(); - - /** * Returns a map of admin to {@link Bundle} map of restrictions set by the admins for the * provided {@code packageName} in the provided {@code userId} */ diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 99258c6e67a8..cec64afa146e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -885,10 +885,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { "enable_permission_based_access"; private static final boolean DEFAULT_VALUE_PERMISSION_BASED_ACCESS_FLAG = false; - // TODO(b/266831522) remove the flag after rollout. - private static final String APPLICATION_EXEMPTIONS_FLAG = "application_exemptions"; - private static final boolean DEFAULT_APPLICATION_EXEMPTIONS_FLAG = true; - private static final int RETRY_COPY_ACCOUNT_ATTEMPTS = 3; /** @@ -3688,26 +3684,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mDevicePolicyEngine.handleStartUser(userId); } - void pushUserControlDisabledPackagesLocked(int userId) { - final int targetUserId; - final ActiveAdmin owner; - if (getDeviceOwnerUserIdUncheckedLocked() == userId) { - owner = getDeviceOwnerAdminLocked(); - targetUserId = UserHandle.USER_ALL; - } else { - owner = getProfileOwnerAdminLocked(userId); - targetUserId = userId; - } - - List<String> protectedPackages = (owner == null || owner.protectedPackages == null) - ? null : owner.protectedPackages; - mInjector.binderWithCleanCallingIdentity(() -> - mInjector.getPackageManagerInternal().setOwnerProtectedPackages( - targetUserId, protectedPackages)); - mUsageStatsManagerInternal.setAdminProtectedPackages(new ArraySet(protectedPackages), - targetUserId); - } - void handleUnlockUser(int userId) { startOwnerService(userId, "unlock-user"); mDevicePolicyEngine.handleUnlockUser(userId); @@ -15912,14 +15888,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public boolean isApplicationExemptionsFlagEnabled() { - return DeviceConfig.getBoolean( - NAMESPACE_DEVICE_POLICY_MANAGER, - APPLICATION_EXEMPTIONS_FLAG, - DEFAULT_APPLICATION_EXEMPTIONS_FLAG); - } - - @Override public List<Bundle> getApplicationRestrictionsPerAdminForUser( String packageName, @UserIdInt int userId) { if (UserHandle.getCallingUserId() != userId |