commit a9e460aefcf3891af5acc7d8ae74da9eed49bfbd
author Robin Lee <rgl@google.com> Wed May 21 15:04:19 2014 +0100
committer Robin Lee <rgl@google.com> Wed May 21 15:19:40 2014 +0100
tree 10c0d5a2e50969d4b3be771ae399c5ca110dd18b
parent 38dfba03d5c7dd6069a9460729fbce4d317f25a2

Remove enforceManagedProfile for listing keyguard features

Change-Id: Ic89f09ada046f64b089b977868b6f37bc0a6de91

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

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. ");
         }
     }