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

Commit 55a578d1 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out DeletePrivateSpaceUnderRestriction 

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I341e13e9d2959acca53be847948b25cf24cf18e0
parent cc862807

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

+0 −10
Original line number Diff line number Diff line
@@ -299,16 +299,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) {