Merge "Remove enforceManagedProfile for listing keyguard features"
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 58fdcc1..4e4d127 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -2940,7 +2940,6 @@
return 0;
}
enforceCrossUserPermission(userHandle);
- enforceNotManagedProfile(userHandle, "list disabled keyguard features");
synchronized (this) {
if (who != null) {
ActiveAdmin admin = getActiveAdminUncheckedLocked(who, userHandle);
@@ -3170,7 +3169,7 @@
private void enforceNotManagedProfile(int userHandle, String message) {
if(isManagedProfile(userHandle)) {
- throw new SecurityException("You can not " + message + " from a managed profile. ");
+ throw new SecurityException("You can not " + message + " for a managed profile. ");
}
}