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

Commit 41a74810 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF)
Browse files

Revert "Clean up fully rolled out DeletePrivateSpaceUnderRestriction" 

Revert submission 28993807-hdop-cleaup

Reason for revert: Droidmonitor created revert due to b/363275535. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28993807-hdop-cleaup

Change-Id: I69e99b8415181fb9d0da345bcfa850598ec96c28
parent da953e41

core/java/android/app/admin/flags/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -293,6 +293,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"

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -1318,8 +1318,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                Bundle prevRestrictions) {

            resetCrossProfileIntentFiltersIfNeeded(userId, newRestrictions, prevRestrictions);

            resetUserVpnIfNeeded(userId, newRestrictions, prevRestrictions);

            if (Flags.deletePrivateSpaceUnderRestriction()) {

                removePrivateSpaceIfRestrictionIsSet(userId, newRestrictions, prevRestrictions);

            }

        }















        private void resetUserVpnIfNeeded(















                int userId, Bundle newRestrictions, Bundle prevRestrictions) {