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

Commit a7f6fa70 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Ensure crypto self test result is logged 

Bug: 335110600
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSecurityLoggingWithSingleUser
Change-Id: I658090a6edc73df17569480df32044358fb4c166
parent daf3a8e0

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

+2 −1
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ import android.app.admin.ManagedProfileProvisioningParams; 
import android.app.admin.ManagedSubscriptionsPolicy;

import android.app.admin.NetworkEvent;

import android.app.admin.PackagePolicy;

import android.app.admin.PackageSetPolicyValue;

import android.app.admin.ParcelableGranteeMap;

import android.app.admin.ParcelableResource;

import android.app.admin.PasswordMetrics;
@@ -349,7 +350,6 @@ import android.app.admin.PolicyValue; 
import android.app.admin.PreferentialNetworkServiceConfig;

import android.app.admin.SecurityLog;

import android.app.admin.SecurityLog.SecurityEvent;

import android.app.admin.PackageSetPolicyValue;

import android.app.admin.StartInstallingUpdateCallback;

import android.app.admin.SystemUpdateInfo;

import android.app.admin.SystemUpdatePolicy;
@@ -2718,6 +2718,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    mDevicePolicyEngine.getResolvedPolicy(

                            PolicyDefinition.SECURITY_LOGGING, UserHandle.USER_ALL));

            setLoggingConfiguration(securityLoggingEnabled, auditLoggingEnabled);

            mInjector.runCryptoSelfTest();

        } else {

            synchronized (getLockObject()) {

                mSecurityLogMonitor.start(getSecurityLoggingEnabledUser());