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

Commit a0248af9 authored by Michal Karpinski's avatar Michal Karpinski Committed by android-build-merger
Browse files

Merge "Logging of setting ro.device_owner property" into nyc-dev am: 44aca78d 

am: b8c98a54

* commit 'b8c98a54':
  Logging of setting ro.device_owner property
parents 6b276f90 b8c98a54

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

+2 −0
Original line number Diff line number Diff line
@@ -1664,12 +1664,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        } else {

            if (mOwners.hasDeviceOwner()) {

                mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "true");

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

                disableDeviceLoggingIfNotCompliant();

                if (mInjector.securityLogGetLoggingEnabledProperty()) {

                    mSecurityLogMonitor.start();

                }

            } else {

                mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "false");

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

            }

        }

    }