Commit 085ecdf2 authored by Henrique Grandinetti's avatar Henrique Grandinetti Committed by Commit Bot

Store remaining usage time in milliseconds

It was stored in minutes, which was causing some rounding problems when the
CheckTimeLimit function was called less than 1 minute before the device being
locked by a screen time.

Bug: 895036
Change-Id: Ia6d243e8d59e32fa07151e76542b6235caf5b33a
Reviewed-on: https://chromium-review.googlesource.com/c/1281662
Commit-Queue: Henrique Grandinetti <hgrandinetti@google.com>
Commit-Queue: Rahul Chaturvedi <rkc@chromium.org>
Reviewed-by: default avatarRahul Chaturvedi <rkc@chromium.org>
Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599747}
parent 4eb8a396
...@@ -242,7 +242,8 @@ void ScreenTimeController::SaveCurrentStateToPref( ...@@ -242,7 +242,8 @@ void ScreenTimeController::SaveCurrentStateToPref(
state_dict->SetKey(kScreenStateTimeUsageLimitEnabled, state_dict->SetKey(kScreenStateTimeUsageLimitEnabled,
base::Value(state.is_time_usage_limit_enabled)); base::Value(state.is_time_usage_limit_enabled));
state_dict->SetKey(kScreenStateRemainingUsage, state_dict->SetKey(kScreenStateRemainingUsage,
base::Value(state.remaining_usage.InMinutes())); base::Value(base::checked_cast<int>(
state.remaining_usage.InMilliseconds())));
state_dict->SetKey(kScreenStateUsageLimitStarted, state_dict->SetKey(kScreenStateUsageLimitStarted,
base::Value(state.time_usage_limit_started.ToDoubleT())); base::Value(state.time_usage_limit_started.ToDoubleT()));
state_dict->SetKey(kScreenStateNextStateChangeTime, state_dict->SetKey(kScreenStateNextStateChangeTime,
...@@ -300,7 +301,7 @@ ScreenTimeController::GetLastStateFromPref() { ...@@ -300,7 +301,7 @@ ScreenTimeController::GetLastStateFromPref() {
if (!remaining_usage || !remaining_usage->is_int()) if (!remaining_usage || !remaining_usage->is_int())
return base::nullopt; return base::nullopt;
result.remaining_usage = result.remaining_usage =
base::TimeDelta::FromMinutes(remaining_usage->GetInt()); base::TimeDelta::FromMilliseconds(remaining_usage->GetInt());
// Verify time_usage_limit_started from the pref is a double value. // Verify time_usage_limit_started from the pref is a double value.
const base::Value* time_usage_limit_started = const base::Value* time_usage_limit_started =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment