diff options
| author | Pavel Grafov <pgrafov@google.com> | 2020-04-08 20:06:01 +0100 |
|---|---|---|
| committer | Pavel Grafov <pgrafov@google.com> | 2020-04-09 15:47:18 +0100 |
| commit | 57c69d1e30e5eb7f41d1d02ddea35c38f9f73ff1 (patch) | |
| tree | 6c5e6e8f0a9c40517296ee1435cd92194aa8ecf0 /core/java | |
| parent | 0131d5018826d995f434be52a53f52189f127a71 (diff) | |
Copy the remaining policies on migration.
* accountTypesWithManagementDisabled
* disableScreenCapture
For security logging nothing has to be done since the state is
stored in a system property, just changed it so that the logging
will be started after the migration and only events for the
right user are logged.
Also removed the todo about hardening for power cut case, the
risk of additional complexity sees to outweight the benefit.
Bug: 149075700
Test: atest DevicePolicyManagerServiceMigrationTest
Change-Id: I3a58325f2d6f415e51998c5096c5fc123d26602d
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index faf9ec61ffde..fb9adb730314 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -8606,7 +8606,7 @@ public class DevicePolicyManager { * <p> * This method may be called on the {@code DevicePolicyManager} instance returned from * {@link #getParentProfileInstance(ComponentName)}. Note that only a profile owner on - * an organization-deviced can affect account types on the parent profile instance. + * an organization-owned device can affect account types on the parent profile instance. * * @return a list of account types for which account management has been disabled. * |