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, 1 insertions, 13 deletions
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 253351a6172e..5ca2dfd04c92 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -274,16 +274,6 @@ 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 4941c52eef20..fb712208f513 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -1328,9 +1328,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Bundle prevRestrictions) { resetCrossProfileIntentFiltersIfNeeded(userId, newRestrictions, prevRestrictions); resetUserVpnIfNeeded(userId, newRestrictions, prevRestrictions); - if (Flags.deletePrivateSpaceUnderRestriction()) { - removePrivateSpaceIfRestrictionIsSet(userId, newRestrictions, prevRestrictions); - } + removePrivateSpaceIfRestrictionIsSet(userId, newRestrictions, prevRestrictions); } private void resetUserVpnIfNeeded( |