commit ca680af21b15ec51f31d294f2f1fe0110562fdfe
author Andy Stadler <stadler@google.com> Wed Jun 01 15:59:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 15:59:58 2011 -0700
tree d0b6825a2a6390597faafb4c49d9eb1b41e7c4f2
parent b145112effca63e770f52c5573980a204035b23a
parent c994d693b684bcba1a690310b5b2be306074cc02

Merge "Use unchecked admin lookup for getStorageEncryption()"

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

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index 92d76be..78636f3 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -1925,9 +1925,8 @@
             // Check for permissions if a particular caller is specified
             if (who != null) {
                 // When checking for a single caller, status is based on caller's request
-                ActiveAdmin ap = getActiveAdminForCallerLocked(who,
-                        DeviceAdminInfo.USES_ENCRYPTED_STORAGE);
-                return ap.encryptionRequested;
+                ActiveAdmin ap = getActiveAdminUncheckedLocked(who);
+                return ap != null ? ap.encryptionRequested : false;
             }
 
             // If no particular caller is specified, return the aggregate set of requests.