summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Johnston <acjohnston@google.com> 2020-02-06 12:31:03 +0000
committer Alex Johnston <acjohnston@google.com> 2020-02-06 13:39:06 +0000
commitfeff951d37feb6d031a18282d64f4274e704f37d (patch)
tree8a32cdab5376d0019266f7ef6754f61db4e56336
parenteb241932c7d64a011bf218852864dd84f7523430 (diff)
Add metrics logging for setTime and setTimeZone
Bug: 148841428 Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetTime atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetTimeZone Change-Id: I9588d1259026f7a4c655a10407fbc90dbef309ca
-rw-r--r--core/proto/android/stats/devicepolicy/device_policy_enums.proto2
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java10
2 files changed, 12 insertions, 0 deletions
diff --git a/core/proto/android/stats/devicepolicy/device_policy_enums.proto b/core/proto/android/stats/devicepolicy/device_policy_enums.proto
index 0f03e69e6c93..d1392a5e0f31 100644
--- a/core/proto/android/stats/devicepolicy/device_policy_enums.proto
+++ b/core/proto/android/stats/devicepolicy/device_policy_enums.proto
@@ -157,4 +157,6 @@ enum EventId {
SET_FACTORY_RESET_PROTECTION = 130;
SET_COMMON_CRITERIA_MODE = 131;
ALLOW_MODIFICATION_OF_ADMIN_CONFIGURED_NETWORKS = 132;
+ SET_TIME = 133;
+ SET_TIME_ZONE = 134;
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 65cabadaa3d8..0afbfa5b68a7 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -11583,6 +11583,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
millis, "DevicePolicyManagerService: setTime");
mInjector.binderWithCleanCallingIdentity(
() -> mInjector.getTimeDetector().suggestManualTime(manualTimeSuggestion));
+
+ DevicePolicyEventLogger
+ .createEvent(DevicePolicyEnums.SET_TIME)
+ .setAdmin(who)
+ .write();
return true;
}
@@ -11599,6 +11604,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
timeZone, "DevicePolicyManagerService: setTimeZone");
mInjector.binderWithCleanCallingIdentity(() ->
mInjector.getTimeZoneDetector().suggestManualTimeZone(manualTimeZoneSuggestion));
+
+ DevicePolicyEventLogger
+ .createEvent(DevicePolicyEnums.SET_TIME_ZONE)
+ .setAdmin(who)
+ .write();
return true;
}