Commit c9ea681f authored by Henrique Grandinetti's avatar Henrique Grandinetti Committed by Commit Bot

Change UsageTimeLimit policy override definition to handle multiple overrides.

Bug: 823536
Change-Id: I60edacb5780c019ae82fbe2df924b240ee0693e8
Reviewed-on: https://chromium-review.googlesource.com/1112051Reviewed-by: default avatarPavol Marko <pmarko@chromium.org>
Commit-Queue: Henrique Grandinetti <hgrandinetti@google.com>
Cr-Commit-Position: refs/heads/master@{#571644}
parent d6417bc1
...@@ -12092,20 +12092,23 @@ ...@@ -12092,20 +12092,23 @@
} }
}, },
'overrides': { 'overrides': {
'type': 'object', 'type': 'array',
'properties': { 'items': {
'action': { 'type': 'object',
'type': 'string', 'properties': {
'enum': [ 'action': {
'LOCK', 'type': 'string',
'UNLOCK' 'enum': [
] 'LOCK',
}, 'UNLOCK'
'created_at_millis': { 'type': 'string' }, ]
'action_specific_data': { },
'type': 'object', 'created_at_millis': { 'type': 'string' },
'properties': { 'action_specific_data': {
'duration_mins': { 'type': 'integer' } 'type': 'object',
'properties': {
'duration_mins': { 'type': 'integer' }
}
} }
} }
} }
...@@ -12142,10 +12145,10 @@ ...@@ -12142,10 +12145,10 @@
'minute': 0 'minute': 0
} }
}, },
'overrides': { 'overrides': [{
'action': 'LOCK', 'action': 'LOCK',
'created_at_millis': '1250000' 'created_at_millis': '1250000'
} }]
}], }],
'id': 448, 'id': 448,
'caption': '''Time Limit''', 'caption': '''Time Limit''',
...@@ -12160,7 +12163,9 @@ ...@@ -12160,7 +12163,9 @@
* If neither time_window_limit nor time_usage_limit is active |LOCK| can be used to lock the device. * If neither time_window_limit nor time_usage_limit is active |LOCK| can be used to lock the device.
* |LOCK| temporarily locks a user session until the next time_window_limit or time_usage_limit starts. * |LOCK| temporarily locks a user session until the next time_window_limit or time_usage_limit starts.
* |UNLOCK| unlocks a user's session locked by time_window_limit or time_usage_limit. * |UNLOCK| unlocks a user's session locked by time_window_limit or time_usage_limit.
|created_time_millis| is the UTC timestamp for the override creation, it is sent as a String because the timestamp wouldn't fit in an integer It is used to determine whether this override should still be applied. If the current active time limit feature (time usage limit or time window limit) started after the override was created, it should not take action. Also if the override was created before the last change of the active time_window_limit or time_usage_window it should not be applied.''' |created_time_millis| is the UTC timestamp for the override creation, it is sent as a String because the timestamp wouldn't fit in an integer It is used to determine whether this override should still be applied. If the current active time limit feature (time usage limit or time window limit) started after the override was created, it should not take action. Also if the override was created before the last change of the active time_window_limit or time_usage_window it should not be applied.
Multiple overrides may be sent, the newest valid entry is the one that is going to be applied.'''
}, },
{ {
'name': 'ArcBackupRestoreServiceEnabled', 'name': 'ArcBackupRestoreServiceEnabled',
......
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