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

Commit 23757444 authored by Andy Stadler's avatar Andy Stadler
Browse files

DO NOT MERGE Use unchecked admin lookup for getStorageEncryption() 

Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin.  This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.

This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.

Backport of: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9

Change-Id: I728b2d85878b7c73a063c906529f0d973e166b49
parent a8629089

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.