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

Commit 0ec0000c authored by Bartosz Fabianowski's avatar Bartosz Fabianowski
Browse files

Allow system UID to call isSecurityLoggingEnabled() 

This CL allows code running under the system UID to call
isSecurityLoggingEnabled(), so that Settings can find out whether
logging is on or off.

Bug: 36584321
Test: m RunSettingsRoboTests

Change-Id: Icf8b7d6cef0f4e23f57bcf0498ffdcf124d16d38
parent 837dde71

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -7207,7 +7207,7 @@ public class DevicePolicyManager { 
     * @return {@code true} if security logging is enabled by device owner, {@code false} otherwise.

     * @throws SecurityException if {@code admin} is not a device owner.

     */

    public boolean isSecurityLoggingEnabled(@NonNull ComponentName admin) {

    public boolean isSecurityLoggingEnabled(@Nullable ComponentName admin) {

        throwIfParentInstance("isSecurityLoggingEnabled");

        try {

            return mService.isSecurityLoggingEnabled(admin);

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

+4 −2
Original line number Diff line number Diff line
@@ -10088,9 +10088,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            return false;

        }



        Preconditions.checkNotNull(admin);

        synchronized (this) {

            if (!isCallerWithSystemUid()) {

                Preconditions.checkNotNull(admin);

                getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);

            }

            return mInjector.securityLogGetLoggingEnabledProperty();

        }

    }