diff options
| -rw-r--r-- | core/java/android/app/admin/flags/flags.aconfig | 10 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index ce06a26b0319..29a5048daae6 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -294,6 +294,16 @@ flag { } flag { + name: "delete_private_space_under_restriction" + namespace: "enterprise" + description: "Delete private space if user restriction is set" + bug: "328758346" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "unmanaged_mode_migration" namespace: "enterprise" description: "Migrate APIs for unmanaged mode" diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index d324d6c4b9c0..4abbdee65acb 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -1318,7 +1318,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Bundle prevRestrictions) { resetCrossProfileIntentFiltersIfNeeded(userId, newRestrictions, prevRestrictions); resetUserVpnIfNeeded(userId, newRestrictions, prevRestrictions); - removePrivateSpaceIfRestrictionIsSet(userId, newRestrictions, prevRestrictions); + if (Flags.deletePrivateSpaceUnderRestriction()) { + removePrivateSpaceIfRestrictionIsSet(userId, newRestrictions, prevRestrictions); + } } private void resetUserVpnIfNeeded( |