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

Commit acafeeb7 authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev am: 8e0ad653 

am: eec59f48

Change-Id: Ia4338c836ac7ca16548c82ffcd5c4d68ef43ab09
parents c3403c54 eec59f48

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

+8 −1
Original line number Diff line number Diff line
@@ -2354,8 +2354,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            final String value = Boolean.toString(hasDeviceOwner);

            mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, value);

            Slog.i(LOG_TAG, "Set ro.device_owner property to " + value);

        }

    }













            if (hasDeviceOwner && mInjector.securityLogGetLoggingEnabledProperty()) {













    private void maybeStartSecurityLogMonitorOnActivityManagerReady() {













        synchronized (getLockObject()) {













            if (mInjector.securityLogIsLoggingEnabled()) {















                mSecurityLogMonitor.start();















                mInjector.runCryptoSelfTest();















                maybePauseDeviceWideLoggingLocked();










@@ -3354,6 +3358,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                loadAdminDataAsync();















                mOwners.systemReady();















                break;













            case SystemService.PHASE_ACTIVITY_MANAGER_READY:













                maybeStartSecurityLogMonitorOnActivityManagerReady();













                break;















            case SystemService.PHASE_BOOT_COMPLETED:















                ensureDeviceOwnerUserStarted(); // TODO Consider better place to do this.















                break;