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

Commit 240f5031 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Clean up fully rolled out DeletePrivateSpaceUnderRestriction" into main

parents 4b676ff6 55a578d1

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

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

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

+1 −3
Original line number Diff line number Diff line
@@ -1328,10 +1328,8 @@ 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) {