diff options
| -rw-r--r-- | core/java/android/app/admin/flags/flags.aconfig | 10 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 6a07484eebc6..0eb67d16436c 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -228,6 +228,16 @@ flag { } flag { + name: "always_persist_do" + namespace: "enterprise" + description: "Always write device_owners2.xml so that migration flags aren't lost" + bug: "335232744" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "is_recursive_required_app_merging_enabled" namespace: "enterprise" description: "Guards a new flow for recursive required enterprise app list merging" diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java index 42ac998bf96c..d02cfee72aa2 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java @@ -357,7 +357,8 @@ class OwnersData { @Override boolean shouldWrite() { - return (mDeviceOwner != null) || (mSystemUpdatePolicy != null) + return Flags.alwaysPersistDo() + || (mDeviceOwner != null) || (mSystemUpdatePolicy != null) || (mSystemUpdateInfo != null); } |