| Index: components/policy/resources/policy_templates.json
|
| diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
|
| index a9699fe8fe7c1f47edb5467251df43fc8cc04ced..f18fd49e16908611a40a314bc97d4b80d3efc1e5 100644
|
| --- a/components/policy/resources/policy_templates.json
|
| +++ b/components/policy/resources/policy_templates.json
|
| @@ -143,7 +143,7 @@
|
| # persistent IDs for all fields (but not for groups!) are needed. These are
|
| # specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
|
| # because doing so would break the deployed wire format!
|
| -# For your editing convenience: highest ID currently used: 369
|
| +# For your editing convenience: highest ID currently used: 370
|
| # And don't forget to also update the EnterprisePolicies enum of
|
| # histograms.xml (run 'python tools/metrics/histograms/update_policies.py').
|
| #
|
| @@ -9548,6 +9548,42 @@
|
|
|
| If this policy is left not set, the default is not allowed for enterprise-managed users and allowed for non-managed users.''',
|
| },
|
| + {
|
| + 'name': 'DeviceEcryptfsMigrationStrategy',
|
| + 'type': 'int-enum',
|
| + 'schema': {
|
| + 'type': 'integer',
|
| + 'enum': [ 0, 1 ],
|
| + },
|
| + 'items': [
|
| + {
|
| + 'name': 'DisallowArc',
|
| + 'value': 0,
|
| + 'caption': '''Disallow data migration and ARC''',
|
| + },
|
| + {
|
| + 'name': 'AllowMigration',
|
| + 'value': 1,
|
| + 'caption': '''Allow data migration''',
|
| + },
|
| + ],
|
| + 'supported_on': ['chrome_os:60-'],
|
| + 'device_only': True,
|
| + 'features': {
|
| + 'dynamic_refresh': True,
|
| + },
|
| + 'example_value': 1,
|
| + 'id': 370,
|
| + 'caption': '''Migration strategy for ecryptfs''',
|
| + 'tags': [],
|
| + 'desc': '''Specifies how a device should behave that shipped before <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> 60 and may have home directories using ecryptfs instead of ext4 encryption.
|
| +
|
| + If you set this policy to 'DisallowArc', Android apps will be disabled for all users on the device (including those that have ext4 encryption already) and no migration from ecryptfs to ext4 encryption will be offered to any users.
|
| +
|
| + If you set this policy to 'AllowMigration', users with ecryptfs home directories will be offered to migrate these to ext4 encryption as necessary (currently when Android N becomes available on the device).
|
| +
|
| + If this policy is left not set, the device will behave as if 'DisallowArc' was chosen.''',
|
| + },
|
| ],
|
| 'messages': {
|
| # Messages that are not associated to any policies.
|
|
|