Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b8c98a542c

* commit 'b8c98a542ccf8addce1cb541525419edc481f8b6':
  Logging of setting ro.device_owner property
This commit is contained in:
Michal Karpinski
2016-03-15 17:18:59 +00:00
committed by android-build-merger
parent 6b276f90a0 b8c98a542c
commit a0248af95f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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");
}
}
}