Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c22d145a authored by Andy Stadler's avatar Andy Stadler Committed by Android Git Automerger
Browse files

am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for... 

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

* commit '3148557c':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
parents 5b4e2440 3148557c

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

+2 −3
Original line number Diff line number Diff line
@@ -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.