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

Commit 3148557c authored by Andy Stadler's avatar Andy Stadler Committed by Android (Google) Code Review
Browse files

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

parents be96408b 23757444

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

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