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

Commit 31426a2e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow system UID to call isSecurityLoggingEnabled()"

parents 1087bd9f 0ec0000c

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();

        }

    }