Commit a5ee41d4 authored by Miriam Polzer's avatar Miriam Polzer Committed by Commit Bot

Add default enum value to ChannelDowngradeBehavior

Add a default value to the device policy enum for
ChannelDowngradeBehavior.

Bug: 1110808
Change-Id: Id5caf1988c0f2c4b9699a058213c772567316811
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345145
Commit-Queue: Alexander Hendrich <hendrich@chromium.org>
Auto-Submit: Miriam Polzer <mpolzer@google.com>
Reviewed-by: default avatarJit Yao Yap <jityao@google.com>
Reviewed-by: default avatarAlexander Hendrich <hendrich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796326}
parent 8cce5f81
...@@ -320,16 +320,19 @@ message AutoUpdateSettingsProto { ...@@ -320,16 +320,19 @@ message AutoUpdateSettingsProto {
// Types of channel downgrade behavior. // Types of channel downgrade behavior.
enum ChannelDowngradeBehavior { enum ChannelDowngradeBehavior {
// Channel downgrade behavior unspecified. Default is
// WAIT_FOR_VERSION_CATCH_UP.
CHANNEL_DOWNGRADE_BEHAVIOR_UNSPECIFIED = 0;
// On a channel downgrade, e.g. beta to stable, wait for the device's // On a channel downgrade, e.g. beta to stable, wait for the device's
// version to become available on the new channel. No updates happen until // version to become available on the new channel. No updates happen until
// then. This is the default. // then. This is the default.
WAIT_FOR_VERSION_CATCH_UP = 0; WAIT_FOR_VERSION_CATCH_UP = 1;
// Roll back and reset the device on a channel downgrade. This does a full // Roll back and reset the device on a channel downgrade. This does a full
// powerwash and tries to preserve wifi and enrollment. // powerwash and tries to preserve wifi and enrollment.
ROLLBACK = 1; ROLLBACK = 2;
// Allow the user to decide whether to wait or roll back and reset on a // Allow the user to decide whether to wait or roll back and reset on a
// user-initiated channel downgrade. // user-initiated channel downgrade.
ALLOW_USER_TO_CONFIGURE = 2; ALLOW_USER_TO_CONFIGURE = 3;
} }
// Specifies what should happen if the device channel is downgraded. // Specifies what should happen if the device channel is downgraded.
......
...@@ -9353,22 +9353,22 @@ ...@@ -9353,22 +9353,22 @@
'type': 'int-enum', 'type': 'int-enum',
'schema': { 'schema': {
'type': 'integer', 'type': 'integer',
'enum': [0, 1, 2], 'enum': [1, 2, 3],
}, },
'items': [ 'items': [
{ {
'name': 'WaitForVersionCatchUp', 'name': 'WaitForVersionCatchUp',
'value': 0, 'value': 1,
'caption': '''Wait for the target channel to catch up on channel downgrade''', 'caption': '''Wait for the target channel to catch up on channel downgrade''',
}, },
{ {
'name': 'Rollback', 'name': 'Rollback',
'value': 1, 'value': 2,
'caption': '''Roll back and reset the device on channel downgrade, try to preserve enrollment''', 'caption': '''Roll back and reset the device on channel downgrade, try to preserve enrollment''',
}, },
{ {
'name': 'AllowUserToConfigure', 'name': 'AllowUserToConfigure',
'value': 2, 'value': 3,
'caption': '''User decides on channel downgrade behavior''', 'caption': '''User decides on channel downgrade behavior''',
}, },
], ],
...@@ -9377,7 +9377,7 @@ ...@@ -9377,7 +9377,7 @@
'features': { 'features': {
'dynamic_refresh': True, 'dynamic_refresh': True,
}, },
'example_value': 0, 'example_value': 1,
'id': 757, 'id': 757,
'caption': '''Channel downgrade behavior''', 'caption': '''Channel downgrade behavior''',
'tags': [], 'tags': [],
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