Merge "Ensure crypto self test result is logged" into main (cdecb49e) · Commits · e / os / android_frameworks_base

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