Commit c65c2f95 authored by xiyuan's avatar xiyuan Committed by Commit bot

Make Easy unlock disabled by default for enterprise user.

BUG=402797
TBR=joaodasilva@chromium.org

Review URL: https://codereview.chromium.org/478773002

Cr-Commit-Position: refs/heads/master@{#293239}
parent cfca18fc
...@@ -289,6 +289,16 @@ void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) { ...@@ -289,6 +289,16 @@ void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) {
new base::StringValue("primary-only"), new base::StringValue("primary-only"),
NULL); NULL);
} }
// Set EasyUnlockAllowed policy to false by default for managed accounts.
if (store()->has_policy() &&
!policy_map->Get(key::kEasyUnlockAllowed)) {
policy_map->Set(key::kEasyUnlockAllowed,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
new base::FundamentalValue(false),
NULL);
}
} }
void UserCloudPolicyManagerChromeOS::FetchPolicyOAuthTokenUsingSigninProfile() { void UserCloudPolicyManagerChromeOS::FetchPolicyOAuthTokenUsingSigninProfile() {
......
...@@ -119,6 +119,10 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test { ...@@ -119,6 +119,10 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
new base::StringValue("primary-only"), new base::StringValue("primary-only"),
NULL); NULL);
policy_map_.Set(key::kEasyUnlockAllowed,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
new base::FundamentalValue(false),
NULL);
expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.CopyFrom(policy_map_); .CopyFrom(policy_map_);
......
...@@ -142,6 +142,11 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) { ...@@ -142,6 +142,11 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
POLICY_SCOPE_USER, POLICY_SCOPE_USER,
new base::StringValue("primary-only"), new base::StringValue("primary-only"),
NULL); NULL);
policy_map->Set(key::kEasyUnlockAllowed,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
new base::FundamentalValue(false),
NULL);
#endif #endif
} }
...@@ -178,6 +183,11 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { ...@@ -178,6 +183,11 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
POLICY_SCOPE_USER, POLICY_SCOPE_USER,
new base::StringValue("primary-only"), new base::StringValue("primary-only"),
NULL); NULL);
expected->Set(key::kEasyUnlockAllowed,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
new base::FundamentalValue(false),
NULL);
#endif #endif
} }
......
...@@ -6612,8 +6612,7 @@ ...@@ -6612,8 +6612,7 @@
If you disable this setting, users will not be allowed to use EasyUnlock. If you disable this setting, users will not be allowed to use EasyUnlock.
If this policy is left not set, EasyUnlock is allowed if the requirements for the feature are satified. If this policy is left not set, the default is not allowed for enterprise-managed users and allowed for non-managed users.''',
''',
}, },
{ {
'name': 'SessionLocales', 'name': 'SessionLocales',
......
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