drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2

Browse Source 
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
This commit is contained in:
Andy Stadler
2011-06-03 10:28:45 -07:00
committed by Android Git Automerger
parent 5b4e24400a 3148557c42
commit c22d145a9f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/DevicePolicyManagerService.java
View File

@ -1925,9 +1925,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
// 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.