Commit 28ff1178 authored by Saurabh Nijhara's avatar Saurabh Nijhara Committed by Commit Bot

Enable DeviceMinimumVersion policy and feature

The policy is planned for the M86 (check bug), so moving it
from 'future_on' to 'supported_on' and enabling the feature.
This is only applicable to ChromeOS.

Bug: 1048607
Change-Id: I9f84adc5c2eee2f8b60c1c25e7c778313c2ea81e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2299351
Commit-Queue: Saurabh Nijhara <snijhara@google.com>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794957}
parent e10d9af3
......@@ -300,11 +300,11 @@ const base::Feature kLoginDisplayPasswordButton{
"LoginDisplayPasswordButton", base::FEATURE_ENABLED_BY_DEFAULT};
// Controls whether to enable the requirement of a minimum chrome version on the
// device through the policy MinimumChromeVersionEnforced. If the requirement is
// device through the policy DeviceMinimumVersion. If the requirement is
// not met and the warning time in the policy has expired, the user is
// restricted from using the session.
const base::Feature kMinimumChromeVersion{"MinimumChromeVersion",
base::FEATURE_DISABLED_BY_DEFAULT};
base::FEATURE_ENABLED_BY_DEFAULT};
// ChromeOS Media App. https://crbug.com/996088.
const base::Feature kMediaApp{"MediaApp", base::FEATURE_ENABLED_BY_DEFAULT};
......
......@@ -578,7 +578,7 @@ const char kWaitForInitialPolicyFetchForTest[] =
// throttled.
const char kDisableArcCpuRestriction[] = "disable-arc-cpu-restriction";
// If this switch is passed, the device policy MinimumChromeVersionEnforced
// If this switch is passed, the device policy DeviceMinimumVersion
// assumes that the device has reached Auto Update Expiration. This is useful
// for testing the policy behaviour on the DUT.
const char kUpdateRequiredAueForTest[] = "aue-reached-for-update-required-test";
......
......@@ -280,7 +280,7 @@ COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsUnfilteredBluetoothDevicesEnabled();
// device is not in tablet mode.
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool ShouldOobeUseTabletModeFirstRun();
// Returns true if device policy MinimumChromeVersionEnforced should assume that
// Returns true if device policy DeviceMinimumVersion should assume that
// Auto Update Expiration is reached. This should only be used for testing.
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
bool IsAueReachedForUpdateRequiredForTest();
......
......@@ -15327,7 +15327,7 @@
{
'name': 'DeviceMinimumVersion',
'owners': ['snijhara@google.com'],
'future_on': ['chrome_os'],
'supported_on': ['chrome_os:86-'],
'device_only': True,
'type': 'dict',
'schema': {
......@@ -15388,7 +15388,7 @@
When this policy is set to a non-empty list:
If none of the entries has a <ph name="CHROMEOS_VERSION_PROPERTY_NAME">chromeos_version</ph> greater than the current version of the device, then no restrictions are applied and the already existing restrictions are revoked.
If at least one of the entries has a <ph name="CHROMEOS_VERSION_PROPERTY_NAME">chromeos_version</ph> greater than the current version, the strongest entry is chosen whose version is greater and closest to the current version.
If at least one of the entries has a <ph name="CHROMEOS_VERSION_PROPERTY_NAME">chromeos_version</ph> greater than the current version, the entry whose version is greater and closest to the current version is chosen.
In case of conflict, preference is given to the entry with lower <ph name="WARNING_PERIOD_PROPERTY_NAME">warning_period</ph> or <ph name="AUE_WARNING_PERIOD_PROPERTY_NAME">aue_warning_period</ph> and the policy is applied using that entry.
If the current version becomes obsolete during user session and the current network limits auto updates, an on-screen notification is shown to update the device within the <ph name="WARNING_PERIOD_PROPERTY_NAME">warning_period</ph> shown in the notification.
......@@ -15411,7 +15411,7 @@
{
'name': 'DeviceMinimumVersionAueMessage',
'owners': ['snijhara@google.com', 'marcgrimme@chromium.org'],
'future_on': ['chrome_os'],
'supported_on': ['chrome_os:86-'],
'device_only': True,
'type': 'string',
'schema': { 'type': 'string' },
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