diff options
| -rw-r--r-- | core/proto/android/stats/devicepolicy/device_policy_enums.proto | 3 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 24 |
2 files changed, 24 insertions, 3 deletions
diff --git a/core/proto/android/stats/devicepolicy/device_policy_enums.proto b/core/proto/android/stats/devicepolicy/device_policy_enums.proto index d1392a5e0f31..a64883102186 100644 --- a/core/proto/android/stats/devicepolicy/device_policy_enums.proto +++ b/core/proto/android/stats/devicepolicy/device_policy_enums.proto @@ -159,4 +159,7 @@ enum EventId { ALLOW_MODIFICATION_OF_ADMIN_CONFIGURED_NETWORKS = 132; SET_TIME = 133; SET_TIME_ZONE = 134; + SET_PERSONAL_APPS_SUSPENDED = 135; + SET_MANAGED_PROFILE_MAXIMUM_TIME_OFF = 136; + COMP_TO_ORG_OWNED_PO_MIGRATED = 137; } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 3171341b9363..e469067d23b4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2542,7 +2542,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { * corporate owned device. */ @GuardedBy("getLockObject()") - private void maybeMigrateToProfileOnOrganizationOwnedDeviceLocked() { + private void migrateToProfileOnOrganizationOwnedDeviceIfCompLocked() { logIfVerbose("Checking whether we need to migrate COMP "); final int doUserId = mOwners.getDeviceOwnerUserId(); if (doUserId == UserHandle.USER_NULL) { @@ -2605,6 +2605,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { // Note: KeyChain keys are not removed and will remain accessible for the apps that have // been given grants to use them. + + DevicePolicyEventLogger + .createEvent(DevicePolicyEnums.COMP_TO_ORG_OWNED_PO_MIGRATED) + .setAdmin(poAdminComponent) + .write(); } private void moveDoPoliciesToProfileParentAdmin(ActiveAdmin doAdmin, ActiveAdmin parentAdmin) { @@ -3865,7 +3870,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { case SystemService.PHASE_ACTIVITY_MANAGER_READY: maybeStartSecurityLogMonitorOnActivityManagerReady(); synchronized (getLockObject()) { - maybeMigrateToProfileOnOrganizationOwnedDeviceLocked(); + migrateToProfileOnOrganizationOwnedDeviceIfCompLocked(); } final int userId = getManagedUserId(UserHandle.USER_SYSTEM); if (userId >= 0) { @@ -15551,6 +15556,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { mInjector.binderWithCleanCallingIdentity( () -> applyPersonalAppsSuspension(callingUserId, suspended)); + + DevicePolicyEventLogger + .createEvent(DevicePolicyEnums.SET_PERSONAL_APPS_SUSPENDED) + .setAdmin(who) + .setBoolean(suspended) + .write(); } /** @@ -15722,9 +15733,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { mInjector.binderWithCleanCallingIdentity( () -> updatePersonalAppSuspension(userId, mUserManager.isUserUnlocked())); + + DevicePolicyEventLogger + .createEvent(DevicePolicyEnums.SET_MANAGED_PROFILE_MAXIMUM_TIME_OFF) + .setAdmin(who) + .setTimePeriod(timeoutMs) + .write(); } - void enforceHandlesCheckPolicyComplianceIntent(@UserIdInt int userId, String packageName) { + private void enforceHandlesCheckPolicyComplianceIntent( + @UserIdInt int userId, String packageName) { mInjector.binderWithCleanCallingIdentity(() -> { final Intent intent = new Intent(DevicePolicyManager.ACTION_CHECK_POLICY_COMPLIANCE); intent.setPackage(packageName); |