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

Commit 3ec4f573 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Add metrics logging for setTime and setTimeZone"

parents 71e8d7e4 feff951d

core/proto/android/stats/devicepolicy/device_policy_enums.proto

+2 −0
Original line number Diff line number Diff line
@@ -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;

}

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

+10 −0
Original line number Diff line number Diff line
@@ -11598,6 +11598,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;















    }























@@ -11614,6 +11619,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;















    }