Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andy Stadler
2011-06-03 10:24:27 -07:00
committed by Android (Google) Code Review
parent be96408b80 237574444b
commit 3148557c42
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 // Check for permissions if a particular caller is specified
if (who != null) { if (who != null) {
// When checking for a single caller, status is based on caller's request // When checking for a single caller, status is based on caller's request
ActiveAdmin ap = getActiveAdminForCallerLocked(who, ActiveAdmin ap = getActiveAdminUncheckedLocked(who);
DeviceAdminInfo.USES_ENCRYPTED_STORAGE); return ap != null ? ap.encryptionRequested : false;
return ap.encryptionRequested;
} }
// If no particular caller is specified, return the aggregate set of requests. // If no particular caller is specified, return the aggregate set of requests.